Fix building with GCC 4.4

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 122 insertions, 4 deletions

diff --git a/net-misc/omnievents/ChangeLog b/net-misc/omnievents/ChangeLog
index d9c5cd0de504..b0b7fb5513e7 100644
--- a/net-misc/omnievents/ChangeLog
+++ b/net-misc/omnievents/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/omnievents
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/ChangeLog,v 1.5 2008/04/22 19:53:55 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/ChangeLog,v 1.6 2009/07/20 15:16:32 vostorga Exp $
+
+  20 Jul 2009; Víctor Ostorga <vostorga@gentoo.org>
+  omnievents-2.6.2.ebuild, +files/omnievents-2.6.2-gcc44.patch:
+  Fix building with GCC 4.4
 
   22 Apr 2008; Samuli Suominen <drac@gentoo.org>
   +files/omnievents-2.6.2-gcc43.patch, omnievents-2.6.2.ebuild:
diff --git a/net-misc/omnievents/files/omnievents-2.6.2-gcc44.patch b/net-misc/omnievents/files/omnievents-2.6.2-gcc44.patch
new file mode 100644
index 000000000000..ae41870387f1
--- /dev/null
+++ b/net-misc/omnievents/files/omnievents-2.6.2-gcc44.patch
@@ -0,0 +1,112 @@
+diff -NrU5 omniEvents-2_6_2.original/examples/pullcons.cc omniEvents-2_6_2/examples/pullcons.cc
+--- omniEvents-2_6_2.original/examples/pullcons.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/examples/pullcons.cc	2009-07-20 15:00:32.000000000 +0000
+@@ -146,10 +146,12 @@
+ 
+ #ifdef HAVE_SIGNAL_H
+ #  include <signal.h>
+ #endif
+ 
++#include <cstdio>
++
+ #include "CosEventComm.hh"
+ #include "CosEventChannelAdmin.hh"
+ #include "naming.h"
+ 
+ static void usage(int argc, char **argv);
+diff -NrU5 omniEvents-2_6_2.original/examples/pullsupp.cc omniEvents-2_6_2/examples/pullsupp.cc
+--- omniEvents-2_6_2.original/examples/pullsupp.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/examples/pullsupp.cc	2009-07-20 15:02:27.000000000 +0000
+@@ -142,10 +142,12 @@
+ 
+ #ifdef HAVE_SIGNAL_H
+ #  include <signal.h>
+ #endif
+ 
++#include <cstdio>
++
+ #include "CosEventComm.hh"
+ #include "CosEventChannelAdmin.hh"
+ #include "naming.h"
+ 
+ static omni_semaphore connect_cond(0);
+diff -NrU5 omniEvents-2_6_2.original/examples/pushcons.cc omniEvents-2_6_2/examples/pushcons.cc
+--- omniEvents-2_6_2.original/examples/pushcons.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/examples/pushcons.cc	2009-07-20 15:04:35.000000000 +0000
+@@ -157,10 +157,12 @@
+ 
+ #ifdef HAVE_SIGNAL_H
+ #  include <signal.h>
+ #endif
+ 
++#include <cstdio>
++
+ #include "CosEventComm.hh"
+ #include "CosEventChannelAdmin.hh"
+ #include "naming.h"
+ 
+ static omni_mutex mutex;
+diff -NrU5 omniEvents-2_6_2.original/examples/pushsupp.cc omniEvents-2_6_2/examples/pushsupp.cc
+--- omniEvents-2_6_2.original/examples/pushsupp.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/examples/pushsupp.cc	2009-07-20 15:06:39.000000000 +0000
+@@ -150,10 +150,12 @@
+ 
+ #ifdef HAVE_SIGNAL_H
+ #  include <signal.h>
+ #endif
+ 
++#include <cstdio>
++
+ #include "CosEventComm.hh"
+ #include "CosEventChannelAdmin.hh"
+ #include "naming.h"
+ 
+ static void usage(int argc, char **argv);
+diff -NrU5 omniEvents-2_6_2.original/tools/eventc.cc omniEvents-2_6_2/tools/eventc.cc
+--- omniEvents-2_6_2.original/tools/eventc.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/tools/eventc.cc	2009-07-20 14:55:48.000000000 +0000
+@@ -182,10 +182,12 @@
+ 
+ #ifdef HAVE_SIGNAL_H
+ #  include <signal.h>
+ #endif
+ 
++#include <cstdio>
++
+ #include "omniEvents.hh"
+ #include "naming.h"
+ 
+ static void usage(int argc, char **argv);
+ static void appendCriterion(   CosLifeCycle::Criteria&,const char*,const char*);
+diff -NrU5 omniEvents-2_6_2.original/tools/eventf.cc omniEvents-2_6_2/tools/eventf.cc
+--- omniEvents-2_6_2.original/tools/eventf.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/tools/eventf.cc	2009-07-20 14:56:51.000000000 +0000
+@@ -44,10 +44,12 @@
+ #  include <iostream>
+ #else
+ #  include <iostream.h>
+ #endif
+ 
++#include <cstdio>
++
+ #ifdef HAVE_STD_IOSTREAM
+ using namespace std;
+ #endif
+ 
+ #include "CosEventChannelAdmin.hh"
+diff -NrU5 omniEvents-2_6_2.original/tools/rmeventc.cc omniEvents-2_6_2/tools/rmeventc.cc
+--- omniEvents-2_6_2.original/tools/rmeventc.cc	2009-07-20 14:48:58.000000000 +0000
++++ omniEvents-2_6_2/tools/rmeventc.cc	2009-07-20 14:58:38.000000000 +0000
+@@ -44,10 +44,12 @@
+ #  include <iostream>
+ #else
+ #  include <iostream.h>
+ #endif
+ 
++#include <cstdio>
++
+ #ifdef HAVE_STD_IOSTREAM
+ using namespace std;
+ #endif
+ 
+ #include "CosEventChannelAdmin.hh"
diff --git a/net-misc/omnievents/omnievents-2.6.2.ebuild b/net-misc/omnievents/omnievents-2.6.2.ebuild
index 30433dd4c331..fc3cfa931d08 100644
--- a/net-misc/omnievents/omnievents-2.6.2.ebuild
+++ b/net-misc/omnievents/omnievents-2.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/omnievents-2.6.2.ebuild,v 1.4 2008/04/22 19:53:55 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/omnievents-2.6.2.ebuild,v 1.5 2009/07/20 15:16:32 vostorga Exp $
 
 inherit eutils versionator
 
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=net-misc/omniORB-4"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
@@ -23,6 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_compile() {