Fix building with GCC 4.4

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 125 insertions, 6 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/Manifest b/net-misc/omnievents/Manifest
index 8c6fdc29b92f..db1f76643417 100644
--- a/net-misc/omnievents/Manifest
+++ b/net-misc/omnievents/Manifest
@@ -1,7 +1,8 @@
 AUX omnievents-2.6.2-gcc43.patch 634 RMD160 6e92790a6b77aab6201a1002b7d8e14e16cf19b1 SHA1 c78169a28521f764856a36c9a58cdfe76b96add2 SHA256 d12bd085c56ba077e52b903686b48cbd1cbc7bd2005aeee481ab37732619649c
+AUX omnievents-2.6.2-gcc44.patch 3349 RMD160 7b900b2e846ff4ad1ab74cc6eefe1d7fcfaa5318 SHA1 eb022e82ee02cd35dcbc45a7a59c431960dc3cc9 SHA256 de2410d25ba375825b7993c48c3ac7f740e7ec7c81eaa156838c77bd3ef5c790
 AUX omnievents-conf 804 RMD160 27c8ba57601486a05203749532e5db00b69fa4e9 SHA1 569df81c99457d79bb20172522090b330d58d0d8 SHA256 03e9565e7abe0c2cdcfc023e8359d9b0f63574b43b539d4894747240d6a4ffae
 AUX omnievents-init 769 RMD160 73b807c9b9bb5a6615a4bc4d158dd408a57c3de5 SHA1 6f75724ecf6b5a99fa55eef9ee57154e79c04a8d SHA256 240f9f265daae95d10673d062f081b17269395abb14159f57bf7c02bf3d5ba0d
 DIST omniEvents-2_6_2-src.tar.gz 1328376 RMD160 a4d7eb057187de26133b85d532fd4c0d765a6cb4 SHA1 38a7a1cebe489f1bdcfd9992fbe320147f40c7fa SHA256 1092c6f173b2f63b2f6b22683f0651fb34fb36f7919fe2ac90f2336c4112aee6
-EBUILD omnievents-2.6.2.ebuild 1084 RMD160 7e48dc410e9df80490f1f97d4b7cd48ec6fe16d8 SHA1 6e2556e62bf708368258eda2e2649b6e0cc31625 SHA256 c9b78d74fa91b28435727344b7cc0bee08c4b1515561b7d24c7054be4297b5d2
-MISC ChangeLog 1019 RMD160 9a802eabcaee76b9c6fa2f1290a3345a7ed7ace7 SHA1 f94bea169653f561c7f011f0ad6b771b951dd3d6 SHA256 cd9507df18a36214494c3f752157a30d8b7bdad2ead4311bf200fa11d71e3fc9
+EBUILD omnievents-2.6.2.ebuild 1138 RMD160 1f36eb04d9f3b384592f36683313f64795115442 SHA1 545a71280eb830c31d0bcdcfcb99119e8d39e62a SHA256 2f68d352cdee9b08ac20bfc2680c389bd7fd5422df8521ffae00d7f4695846f2
+MISC ChangeLog 1169 RMD160 3702842b61c96b40c996e18ca3e81e897daaa39b SHA1 12f2dd3f3769a33619fb6a8ef7f45199e64602d1 SHA256 2c15a245aa3d1d899358bd6aedd8a8d434763faa9d1ab3b5a9c94f8ae217b099
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
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() {