Fix up for modular X and compilation with GCC 4.1

Package-Manager: portage-2.1.1_rc1

5 files changed, 232 insertions, 20 deletions

diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index 836cd485f5af..f4d03f8db075 100644
--- a/dev-util/rhide/ChangeLog
+++ b/dev-util/rhide/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/rhide
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.15 2005/08/29 02:46:40 azarah Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.16 2006/08/28 06:39:48 truedfx Exp $
+
+  27 Aug 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/rhide-1.5.20050823-gcc41.patch, rhide-1.5.20050823.ebuild:
+  Fix up for modular X and GCC 4.1 (#120774)
 
 *rhide-1.5.20050823 (29 Aug 2005)
 
diff --git a/dev-util/rhide/Manifest b/dev-util/rhide/Manifest
index a37062d72d2d..40114dc59558 100644
--- a/dev-util/rhide/Manifest
+++ b/dev-util/rhide/Manifest
@@ -1,21 +1,64 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 82621f05d22c15020fffaf146ac43ea1 rhide-1.5.20050823.ebuild 7146
-MD5 5784a2af44e325cdde5b45fc6038cc36 ChangeLog 2777
-MD5 77beedd15d778a0153d122b14854718e rhide-1.5-r1.ebuild 7004
-MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
-MD5 6ff94c75f70caf1f06d4fd1011c516c3 files/rhide-1.5-gcc-3.3.patch 1837
-MD5 a6c2683f6390c63674a6db90d653a66e files/digest-rhide-1.5.20050823 285
-MD5 5fc15112eb4dc31a46ef3e687d90279a files/digest-rhide-1.5-r1 261
+AUX 80rhide 27 RMD160 592f7d77778fc74745a128779f08c4cf50dd0526 SHA1 c866810d1a4f95efc9c0136af831f817a4ae478c SHA256 05d92436263efa401a5d18106a368bc3bb68e77788ff4ca5258fef8da5f5b75c
 MD5 c81b93769c56ac52fdc4b8a8b88a8c68 files/80rhide 27
-MD5 8c387a4a4dba33ca685bd5adeb06cd86 files/rhide-1.5.20050823-amd64-support.patch 394
+RMD160 592f7d77778fc74745a128779f08c4cf50dd0526 files/80rhide 27
+SHA256 05d92436263efa401a5d18106a368bc3bb68e77788ff4ca5258fef8da5f5b75c files/80rhide 27
+AUX rhide-1.5-gcc-3.3.patch 1837 RMD160 92c56f8711c1628524df6a790ebc705e3384a7e7 SHA1 2b86618ff195262f5224e8c680f40fd28a927309 SHA256 76d2b8fd5ab8c79d4c43dc615c79631818ae2d15955b60eeadfc462216978da4
+MD5 6ff94c75f70caf1f06d4fd1011c516c3 files/rhide-1.5-gcc-3.3.patch 1837
+RMD160 92c56f8711c1628524df6a790ebc705e3384a7e7 files/rhide-1.5-gcc-3.3.patch 1837
+SHA256 76d2b8fd5ab8c79d4c43dc615c79631818ae2d15955b60eeadfc462216978da4 files/rhide-1.5-gcc-3.3.patch 1837
+AUX rhide-1.5-rhtvision2.patch 3528 RMD160 79d8a93a675c232bb0c8f06cd7e05b8e3cd7e7fa SHA1 fae69eb06794a8c797254bea703a3cb8eb4e3f60 SHA256 492ba23e00f206524608406a74dbf788fd6bbffa9021b22b60d5ab25280c72c8
 MD5 85d4b0e04b34c3c230795c9588ef044b files/rhide-1.5-rhtvision2.patch 3528
+RMD160 79d8a93a675c232bb0c8f06cd7e05b8e3cd7e7fa files/rhide-1.5-rhtvision2.patch 3528
+SHA256 492ba23e00f206524608406a74dbf788fd6bbffa9021b22b60d5ab25280c72c8 files/rhide-1.5-rhtvision2.patch 3528
+AUX rhide-1.5.20050823-amd64-support.patch 394 RMD160 34d3dd7e3d743b3dd755e2a273c03bb848117564 SHA1 c77b66648e763387da12cd968c32914ffa60c71b SHA256 0b7fb1038e046619a062fc36749917abf119b9a59648bb1929bdec4982bf3e0c
+MD5 8c387a4a4dba33ca685bd5adeb06cd86 files/rhide-1.5.20050823-amd64-support.patch 394
+RMD160 34d3dd7e3d743b3dd755e2a273c03bb848117564 files/rhide-1.5.20050823-amd64-support.patch 394
+SHA256 0b7fb1038e046619a062fc36749917abf119b9a59648bb1929bdec4982bf3e0c files/rhide-1.5.20050823-amd64-support.patch 394
+AUX rhide-1.5.20050823-gcc41.patch 4109 RMD160 9588826e5af993d5b8029e88521895b86b831d7f SHA1 ab4a2793810382c94be2a73d5aaa8292d134988c SHA256 2f362bc66dc1585c620cb9d9779cbb0966ab52d539d288ccd3c630c7e3818fb7
+MD5 3a85eaebe66c9787f0d6628b33f96299 files/rhide-1.5.20050823-gcc41.patch 4109
+RMD160 9588826e5af993d5b8029e88521895b86b831d7f files/rhide-1.5.20050823-gcc41.patch 4109
+SHA256 2f362bc66dc1585c620cb9d9779cbb0966ab52d539d288ccd3c630c7e3818fb7 files/rhide-1.5.20050823-gcc41.patch 4109
+AUX tvrc 123 RMD160 24683f8a717bfbeb30c9c987448b1bf238f8753b SHA1 1a69b64ea7bf56548c2411cd96e124dabb47f9e3 SHA256 63e7b8a3eb7650e32b9c41843a2c652314dfaf60f1e5612ebdb12855fe6b7828
 MD5 5a96d86d3e84dac00c7042aaa9107ee7 files/tvrc 123
+RMD160 24683f8a717bfbeb30c9c987448b1bf238f8753b files/tvrc 123
+SHA256 63e7b8a3eb7650e32b9c41843a2c652314dfaf60f1e5612ebdb12855fe6b7828 files/tvrc 123
+DIST gdb-5.3.tar.bz2 11198721
+DIST gdb-6.1.1.tar.bz2 12586670 RMD160 5e2d2fe150276c5be513d5c3427bbe6f2c9d0696 SHA1 39f239373e282061eb6b7d024f17516e2e6e2226 SHA256 c340fcfc7483f75c210879bb7c0ed3c760ae458f6a5137dbffb305b27a735893
+DIST rhide-1.5.20050823.tar.bz2 765258 RMD160 2c256565921a26a4e2ba8b903a130850133b3eed SHA1 083832c3321cf326d74bd5ab3ed8e46f79659048 SHA256 e7f3d314ea409b1286154adcd45e89dfcf362572efe3f742006786bd5344bd88
+DIST rhide-1.5.tar.gz 959140
+DIST rhtvision-2.0.1.src.tar.gz 1168371
+DIST setedit-0.5.0.tar.gz 1706625
+DIST setedit-0.5.5.20050828.tar.bz2 1960480 RMD160 e59dfeb51936e1a915037c744734dc052c4f66fd SHA1 91fcb65b37c6ab7c6f6ac47377447429795b8d51 SHA256 da7b2dc9f494b75bc67bd357d8602ad987512866cfa3caf94556655ccc272e8a
+DIST tvision-2.10.20050824.tar.bz2 863122 RMD160 51d760b395760370e830d5e499bb12f6f09d5c5e SHA1 aa502d5918880a843567f2e47854e8cbbe9bcd75 SHA256 ff1f16eb61548b50701d86dbe11ecd1078a1f735825e4df45afb317ea53ee456
+EBUILD rhide-1.5-r1.ebuild 7004 RMD160 8db393e2261b42dc275af7f8e7508cf000861d87 SHA1 0b4c4e7cf6fd8aa7920cae6ef681b29c80535cc2 SHA256 48acebfe200a4b6bb45861399a0c1d84e4a8270d0efc199ddaeffb1889fefd50
+MD5 77beedd15d778a0153d122b14854718e rhide-1.5-r1.ebuild 7004
+RMD160 8db393e2261b42dc275af7f8e7508cf000861d87 rhide-1.5-r1.ebuild 7004
+SHA256 48acebfe200a4b6bb45861399a0c1d84e4a8270d0efc199ddaeffb1889fefd50 rhide-1.5-r1.ebuild 7004
+EBUILD rhide-1.5.20050823.ebuild 7314 RMD160 044e9a728a0bbbd8252e659c0b3b51f05f9657f8 SHA1 dc382d47df20954786aca6100171f7f1d74ce68d SHA256 70f35da5793a6e667c47a1f3bbeb527736471f7404934cb6f6b78e0b61540a2d
+MD5 89d6142e94cf0fa13e540efdee5a92f4 rhide-1.5.20050823.ebuild 7314
+RMD160 044e9a728a0bbbd8252e659c0b3b51f05f9657f8 rhide-1.5.20050823.ebuild 7314
+SHA256 70f35da5793a6e667c47a1f3bbeb527736471f7404934cb6f6b78e0b61540a2d rhide-1.5.20050823.ebuild 7314
+MISC ChangeLog 2944 RMD160 d3983924409dfb963b0d3cf19af2e53d9cc4cb13 SHA1 1cb59979dfea856ff5d44fb9ca7c24e0c8e8bbcf SHA256 e2fb76cfda0874cfc91bae480dc31535bc6585e2ae1c872cf791bb1dc1959589
+MD5 01239d15b2332654dbc32fd41a418037 ChangeLog 2944
+RMD160 d3983924409dfb963b0d3cf19af2e53d9cc4cb13 ChangeLog 2944
+SHA256 e2fb76cfda0874cfc91bae480dc31535bc6585e2ae1c872cf791bb1dc1959589 ChangeLog 2944
+MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0
+MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
+RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223
+SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0 metadata.xml 223
+MD5 5fc15112eb4dc31a46ef3e687d90279a files/digest-rhide-1.5-r1 261
+RMD160 eca20bf4e905024eb5b94334a4f4830368c60e0c files/digest-rhide-1.5-r1 261
+SHA256 6f343a4005cbf5a6955a128913336065433532338a5aba04a15923eca43e0a2e files/digest-rhide-1.5-r1 261
+MD5 1155d8ff5470b47d247a302460511618 files/digest-rhide-1.5.20050823 1039
+RMD160 3e81017e6d4bc824913af4d34bbd16b66cd9fba0 files/digest-rhide-1.5.20050823 1039
+SHA256 ee4ac96669e64aa2630307c8f1b63aad435b9e183aaa5340babcc4011ad31287 files/digest-rhide-1.5.20050823 1039
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFDEnp11ZcsMnZjRyIRAgXZAKCUdPIgg0RB44rOSOVTSgv4gdpR9QCeIyoi
-o/OWp39clKc0YhIUdTzC4rQ=
-=o9ee
+iD8DBQFE8o/HwnQyISwouHwRAovNAKCoJRB3rDA9vW7M+af9MUwWIQcIWgCgpHam
+1cRi35OkXkhoLydzrLXUf8w=
+=JsWI
 -----END PGP SIGNATURE-----
diff --git a/dev-util/rhide/files/digest-rhide-1.5.20050823 b/dev-util/rhide/files/digest-rhide-1.5.20050823
index 9cd148c31a8f..77530fe27bd8 100644
--- a/dev-util/rhide/files/digest-rhide-1.5.20050823
+++ b/dev-util/rhide/files/digest-rhide-1.5.20050823
@@ -1,4 +1,12 @@
+MD5 dd25473f61a3a2e1b08dee5f67ebae28 gdb-6.1.1.tar.bz2 12586670
+RMD160 5e2d2fe150276c5be513d5c3427bbe6f2c9d0696 gdb-6.1.1.tar.bz2 12586670
+SHA256 c340fcfc7483f75c210879bb7c0ed3c760ae458f6a5137dbffb305b27a735893 gdb-6.1.1.tar.bz2 12586670
 MD5 a63feb8650a1b1c472e116e30feeb3c4 rhide-1.5.20050823.tar.bz2 765258
-MD5 938319aabc91b765fd2408bfacafc5c7 tvision-2.10.20050824.tar.bz2 863122
+RMD160 2c256565921a26a4e2ba8b903a130850133b3eed rhide-1.5.20050823.tar.bz2 765258
+SHA256 e7f3d314ea409b1286154adcd45e89dfcf362572efe3f742006786bd5344bd88 rhide-1.5.20050823.tar.bz2 765258
 MD5 05a676191694ebf4ac8573e119bdb61b setedit-0.5.5.20050828.tar.bz2 1960480
-MD5 dd25473f61a3a2e1b08dee5f67ebae28 gdb-6.1.1.tar.bz2 12586670
+RMD160 e59dfeb51936e1a915037c744734dc052c4f66fd setedit-0.5.5.20050828.tar.bz2 1960480
+SHA256 da7b2dc9f494b75bc67bd357d8602ad987512866cfa3caf94556655ccc272e8a setedit-0.5.5.20050828.tar.bz2 1960480
+MD5 938319aabc91b765fd2408bfacafc5c7 tvision-2.10.20050824.tar.bz2 863122
+RMD160 51d760b395760370e830d5e499bb12f6f09d5c5e tvision-2.10.20050824.tar.bz2 863122
+SHA256 ff1f16eb61548b50701d86dbe11ecd1078a1f735825e4df45afb317ea53ee456 tvision-2.10.20050824.tar.bz2 863122
diff --git a/dev-util/rhide/files/rhide-1.5.20050823-gcc41.patch b/dev-util/rhide/files/rhide-1.5.20050823-gcc41.patch
new file mode 100644
index 000000000000..8b9c161c72de
--- /dev/null
+++ b/dev-util/rhide/files/rhide-1.5.20050823-gcc41.patch
@@ -0,0 +1,151 @@
+--- 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 */
+--- setedit/infview/include/inf.h
++++ setedit/infview/include/inf.h
+@@ -310,7 +310,7 @@
+ 
+  virtual TPalette& getPalette() const;
+  virtual void close();
+- virtual TInfWindow::~TInfWindow();
++ virtual ~TInfWindow();
+  TInfViewer *viewer;
+  Boolean isTheOne;
+  static void SetMagicEditorInfoTranslation() { TInfViewer::TranslateName=1; };
+--- setedit/setedit/runprog.cc
++++ setedit/setedit/runprog.cc
+@@ -89,17 +89,15 @@
+  if (!Command[0])
+     strcpy(Command,"make");
+ 
+- #pragma pack(1)
+  struct
+  {
+-  char   ComAux[maxCommand]  __attribute__((packed));
++  char   ComAux[maxCommand];
+-  uint32 Options             __attribute__((packed));
++  uint32 Options;
+-  uint32 OpsScroll           __attribute__((packed));
++  uint32 OpsScroll;
+-  uint32 OpsScrHz            __attribute__((packed));
++  uint32 OpsScrHz;
+-  char   Lines[4]            __attribute__((packed));
++  char   Lines[4];
+-  TListBoxRec tl             __attribute__((packed));
++  TListBoxRec tl;
+  } box;
+- #pragma pack()
+  strcpy(box.ComAux,Command);
+  box.Options=Options & (~edsmScrollMask);
+  box.OpsScroll=(Options & edsmScrollMask)/edsmScrollShifter;
+--- rhide-1.5.20050823/rhgdb/include/rhgdb.h
++++ rhide-1.5.20050823/rhgdb/include/rhgdb.h
+@@ -46,8 +46,8 @@
+ extern int use_dual_display;
+ class TDirList;
+ extern TDirList *src_dirs;
+-class TDisassemblerWindow;
++class TWindow;
+-extern TDisassemblerWindow *dis_win;
++extern TWindow *dis_win;
+ class TDataWindow;
+ 
+ void STEP(int _switch_to_user = 1);
+--- rhide-1.5.20050823/rhgdb/main.cc
++++ rhide-1.5.20050823/rhgdb/main.cc
+@@ -119,7 +119,7 @@
+ int tabsize = 8;
+ int use_dual_display = 0;
+ 
+-TDisassemblerWindow *dis_win = NULL;
++TWindow *dis_win = NULL;
+ 
+ static void ReadOptions(char *);
+ static void SaveOptions(char *);
+@@ -426,7 +426,7 @@
+     TRect r(1, 1, 79, 20);
+ 
+     dis_win = new TDisassemblerWindow(r, _("Disassembler window"));
+-    AddWindow(dis_win, (TWindow **) & dis_win);
++    AddWindow(dis_win, & dis_win);
+   }
+ }
+ 
+@@ -443,18 +443,18 @@
+   if (TProgram::deskTop->execView(insp) == cmOK)
+   {
+     insp->getData(buf);
+-    TInspector *w = new TInspector(TProgram::deskTop->getExtent(), buf);
++    TWindow *w = new TInspector(TProgram::deskTop->getExtent(), buf);
+ 
+     w->helpCtx = hcInspector;
+     w->options |= ofCentered;
+-    w->update(buf);
++    ((TInspector *) w)->update(buf);
+-    AddWindow(w, (TWindow **) & w);
++    AddWindow(w, & w);
+   }
+   TObject::destroy(insp);
+ }
+ 
+ 
+-static TDataWindow *stack_win = NULL;
++static TWindow *stack_win = NULL;
+ 
+ void
+ RHGDBApp::handleEvent(TEvent & event)
+@@ -498,7 +498,7 @@
+         case cmDisWindow:
+           OpenDisWin();
+           if (debugger_started())
+-            dis_win->update(stop_pc);
++            ((TDisassemblerWindow *) dis_win)->update(stop_pc);
+           clearEvent(event);
+           break;
+         case cmDataWindow:
+@@ -511,7 +511,7 @@
+           if (!stack_win)
+           {
+             if ((stack_win = TDataWindow::stackWindow()))
+-              AddWindow(stack_win, (TWindow **) & stack_win);
++              AddWindow(stack_win, & stack_win);
+           }
+           else
+             stack_win->select();
+@@ -676,7 +676,7 @@
+   UpdateCallStackWindow();
+   TDataWindow::updateAll();
+   if (dis_win)
+-    dis_win->update(stop_pc);
++    ((TDisassemblerWindow *) dis_win)->update(stop_pc);
+ }
+ 
+ static void InitDebuggerInterface();
+@@ -1060,7 +1060,7 @@
+     else if (main_line != 0)
+     {
+       OpenDisWin();
+-      dis_win->update(main_line);
++      ((TDisassemblerWindow *) dis_win)->update(main_line);
+     }
+   }
+   app->run();
+@@ -1227,7 +1227,7 @@
+   {
+     extern unsigned long stop_pc;
+ 
+-    dis_win->update(stop_pc);
++    ((TDisassemblerWindow *) dis_win)->update(stop_pc);
+   }
+   if (select_dis_win)
+     dis_win->select();
diff --git a/dev-util/rhide/rhide-1.5.20050823.ebuild b/dev-util/rhide/rhide-1.5.20050823.ebuild
index fe3aa0a7065f..4c31f87d6b54 100644
--- a/dev-util/rhide/rhide-1.5.20050823.ebuild
+++ b/dev-util/rhide/rhide-1.5.20050823.ebuild
@@ -1,6 +1,6 @@
-# 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-util/rhide/rhide-1.5.20050823.ebuild,v 1.1 2005/08/29 02:46:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5.20050823.ebuild,v 1.2 2006/08/28 06:39:48 truedfx Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -39,7 +39,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="X aalib"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	>=dev-libs/libpcre-2.0.6
 	>=app-arch/bzip2-1.0.1
 	>=sys-apps/texinfo-4.1
@@ -49,8 +49,11 @@ DEPEND="virtual/libc
 	>=sys-libs/gpm-1.20.0
 	>=sys-libs/ncurses-5.2
 	aalib? ( media-libs/aalib )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libX11
+		x11-libs/libXmu ) virtual/x11 ) )
 	>=sys-apps/sed-4.0.7"
+DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xproto virtual/x11 ) )"
 
 TV_S="${WORKDIR}/tvision"
 SE_S="${WORKDIR}/setedit"
@@ -102,6 +105,9 @@ src_unpack() {
 	sed -i -e \
 		's:--add-location $(po_list_l):--add-location --from-code=iso-8859-1 $(po_list_l):' \
 		"${SE_S}/internac/gnumake.in"
+
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {