Fix building with GLIBC 2.10+ wrt #272705, thanks to Diego E. Pettenò and Victor Ostorga.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 107 insertions, 7 deletions

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 6694dfa87b5a..32739b591e3d 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/omniORB
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.50 2008/11/01 22:40:32 caster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.51 2009/06/20 15:37:09 ssuominen Exp $
+
+  20 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> omniORB-4.1.3.ebuild,
+  +files/omniORB-4.1.3-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #272705, thanks to Diego E. Pettenò and
+  Victor Ostorga.
 
 *omniORB-4.1.3 (01 Nov 2008)
 
diff --git a/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch b/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch
new file mode 100644
index 000000000000..5eb702c9d08d
--- /dev/null
+++ b/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch
@@ -0,0 +1,93 @@
+diff -NrU5 omniORB-4.1.3.original/src/appl/utils/catior/catior.cc omniORB-4.1.3/src/appl/utils/catior/catior.cc
+--- omniORB-4.1.3.original/src/appl/utils/catior/catior.cc	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/appl/utils/catior/catior.cc	2009-06-11 15:20:45.000000000 +0000
+@@ -358,11 +358,11 @@
+ 
+   int c;
+   int hexflag = 0;
+   int omniflag = 0;
+ 
+-  while((c = getopt(argc,argv,"xo")) != EOF) {
++  while((c = getopt(argc,argv,"xo")) != -1) {
+     switch(c) {
+     case 'x':
+       hexflag = 1;
+       break;
+     case 'o':
+diff -NrU5 omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc omniORB-4.1.3/src/appl/utils/convertior/convertior.cc
+--- omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/appl/utils/convertior/convertior.cc	2009-06-11 15:21:11.000000000 +0000
+@@ -148,11 +148,11 @@
+ 
+   // Get options:
+ 
+   int c;
+ 
+-  while((c = getopt(argc,argv,"x")) != EOF)
++  while((c = getopt(argc,argv,"x")) != -1)
+     {
+       switch(c)
+ 	{
+ 	case '?':
+ 	case 'h':
+diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/def.h omniORB-4.1.3/src/tool/omkdepend/def.h
+--- omniORB-4.1.3.original/src/tool/omkdepend/def.h	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/tool/omkdepend/def.h	2009-06-11 15:21:34.000000000 +0000
+@@ -126,11 +126,11 @@
+ char			*realloc();
+ #endif
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*get_line();
+ struct symtab		*slookup();
+ struct symtab		*isdefined();
+ struct symtab		*fdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/main.c omniORB-4.1.3/src/tool/omkdepend/main.c
+--- omniORB-4.1.3.original/src/tool/omkdepend/main.c	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/tool/omkdepend/main.c	2009-06-11 15:22:23.000000000 +0000
+@@ -467,11 +467,11 @@
+ 
+ /*
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *get_line(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+ 			*eof,	/* end of file pointer */
+ 			*bol;	/* beginning of line pointer */
+diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/parse.c omniORB-4.1.3/src/tool/omkdepend/parse.c
+--- omniORB-4.1.3.original/src/tool/omkdepend/parse.c	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/tool/omkdepend/parse.c	2009-06-11 15:23:19.000000000 +0000
+@@ -39,11 +39,11 @@
+ {
+ 	register char	*line;
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while (line = getline(filep)) {
++	while (line = get_line(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
+ 		case IF:
+ 		doif:
+ 			type = find_includes(filep, file,
+ 				file_red, recursion+1, failOK);
+@@ -164,11 +164,11 @@
+ 	struct inclist		*file, *file_red;
+ {
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while (line = getline(filep)) {
++	while (line = get_line(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
+ 		case IF:
+ 		case IFFALSE:
+ 		case IFGUESSFALSE:
+ 		case IFDEF:
diff --git a/net-misc/omniORB/omniORB-4.1.3.ebuild b/net-misc/omniORB/omniORB-4.1.3.ebuild
index 69e071d01f5a..45a0c1d35f6d 100644
--- a/net-misc/omniORB/omniORB-4.1.3.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.3.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/omniORB/omniORB-4.1.3.ebuild,v 1.1 2008/11/01 22:40:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.3.ebuild,v 1.2 2009/06/20 15:37:09 ssuominen Exp $
 
 inherit python eutils
 
@@ -8,19 +8,21 @@ DESCRIPTION="A robust, high-performance CORBA 2 ORB"
 SRC_URI="mirror://sourceforge/omniorb/${PF}.tar.gz"
 HOMEPAGE="http://omniorb.sourceforge.net/"
 
-IUSE="ssl"
-
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl"
 
-DEPEND="dev-lang/python
+RDEPEND="dev-lang/python
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+
 	sed -i -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
 		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
 		mk/beforeauto.mk.in \