Fix building with GCC 4.3 wrt #218934, thanks to Peter Alfredsen.

Package-Manager: portage-2.1.5_rc6

4 files changed, 55 insertions, 23 deletions

diff --git a/net-misc/omnievents/ChangeLog b/net-misc/omnievents/ChangeLog
index 39ac041b5771..d9c5cd0de504 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.4 2008/04/21 18:02:03 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/ChangeLog,v 1.5 2008/04/22 19:53:55 drac Exp $
+
+  22 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/omnievents-2.6.2-gcc43.patch, omnievents-2.6.2.ebuild:
+  Fix building with GCC 4.3 wrt #218934, thanks to Peter Alfredsen.
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/net-misc/omnievents/Manifest b/net-misc/omnievents/Manifest
index 9abb0ca11fb3..8c6fdc29b92f 100644
--- a/net-misc/omnievents/Manifest
+++ b/net-misc/omnievents/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX omnievents-2.6.2-gcc43.patch 634 RMD160 6e92790a6b77aab6201a1002b7d8e14e16cf19b1 SHA1 c78169a28521f764856a36c9a58cdfe76b96add2 SHA256 d12bd085c56ba077e52b903686b48cbd1cbc7bd2005aeee481ab37732619649c
 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 1001 RMD160 91a7741928facecd316449a96f37913c787a6452 SHA1 85428b375592329956bf7bd77ce27c930f67b4f2 SHA256 b2893dde237363624883fdff3591dfad0418c565c5b17da52b543d852c92242d
-MISC ChangeLog 839 RMD160 c2a803496ae26923684562b25bbebe77c5fa0bb5 SHA1 b8f403eecd1e8e6d83f62e6faa4521025fa9e6db SHA256 02ce660c2d093bc95176578b397705f31ecf2977caac73073c5a186e9fa77d4d
+EBUILD omnievents-2.6.2.ebuild 1084 RMD160 7e48dc410e9df80490f1f97d4b7cd48ec6fe16d8 SHA1 6e2556e62bf708368258eda2e2649b6e0cc31625 SHA256 c9b78d74fa91b28435727344b7cc0bee08c4b1515561b7d24c7054be4297b5d2
+MISC ChangeLog 1019 RMD160 9a802eabcaee76b9c6fa2f1290a3345a7ed7ace7 SHA1 f94bea169653f561c7f011f0ad6b771b951dd3d6 SHA256 cd9507df18a36214494c3f752157a30d8b7bdad2ead4311bf200fa11d71e3fc9
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIDNagyuNVb5qfaOYRAo/8AKDPa0JZCL+CfNB84xvHIgH0ORzeJACgzjSg
-kh7fFL4mrXHX+mr+Br84BCI=
-=ADZI
------END PGP SIGNATURE-----
diff --git a/net-misc/omnievents/files/omnievents-2.6.2-gcc43.patch b/net-misc/omnievents/files/omnievents-2.6.2-gcc43.patch
new file mode 100644
index 000000000000..3625bbb50760
--- /dev/null
+++ b/net-misc/omnievents/files/omnievents-2.6.2-gcc43.patch
@@ -0,0 +1,31 @@
+--- omnievents-2.6.2.orig/src/PersistNode.cc
++++ omnievents-2.6.2/src/PersistNode.cc
+@@ -25,6 +25,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <climits>
+ 
+ namespace OmniEvents {
+ 
+--- omnievents-2.6.2.orig/src/Servant.cc
++++ omnievents-2.6.2/src/Servant.cc
+@@ -35,6 +35,7 @@
+ #endif
+ 
+ #include <stdio.h>     // sprintf
++#include <cstdlib>
+ #include <assert.h>
+ 
+ #ifdef HAVE_IOSTREAM
+--- omnievents-2.6.2.orig/src/main.cc
++++ omnievents-2.6.2/src/main.cc
+@@ -60,6 +60,7 @@
+ #  include <omniORB4/internal/orbOptions.h>
+ #endif
+ 
++#include <cstdlib>
+ #include <stdio.h> // for sprintf
+ 
+ int main(int argc, char** argv)
+
diff --git a/net-misc/omnievents/omnievents-2.6.2.ebuild b/net-misc/omnievents/omnievents-2.6.2.ebuild
index dfb908f6febf..30433dd4c331 100644
--- a/net-misc/omnievents/omnievents-2.6.2.ebuild
+++ b/net-misc/omnievents/omnievents-2.6.2.ebuild
@@ -1,31 +1,37 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 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.3 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/omnievents-2.6.2.ebuild,v 1.4 2008/04/22 19:53:55 drac Exp $
 
-inherit versionator
+inherit eutils versionator
 
-MY_PV=$(replace_all_version_separators "_")
-MY_P="omniEvents-${MY_PV}"
+MY_P=omniEvents-$(replace_all_version_separators "_")
 
 DESCRIPTION="An implementation of the CORBA Events Service for omniORB"
+HOMEPAGE="http://www.omnievents.org"
 SRC_URI="mirror://sourceforge/omnievents/${MY_P}-src.tar.gz"
-HOMEPAGE="http://www.omnievents.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND=">=net-misc/omniORB-4"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
-	econf || die "Failed to configure!"
-	emake -j1 || die "Failed to compile!"
+	econf
+	emake -j1 || die "emake failed."
 }
 
 src_install () {
-	make DESTDIR=${D} install
+	emake -j1 DESTDIR="${D}" install || die "emake install failed."
 
 	doman doc/man/*