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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 110 insertions, 9 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/Manifest b/net-misc/omniORB/Manifest
index 6123a93e6d02..e699b524da8c 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,10 +1,11 @@
 AUX omniNames 677 RMD160 7c75795fa9b4808069060728a0404d6ed1138f78 SHA1 7e5f343aaac339cd84eccb70c17b06b86604d436 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed
 AUX omniORB-4.0.0 706 RMD160 441abb40fdd55b0b0f4254f390f1487ee93fa6d1 SHA1 2c07973961ccef4c41641a408c0f29386706b120 SHA256 646f43fdecb15f3ce17477f21928442bc0ca4c80f7f73e0a6619d087dc06edf5
+AUX omniORB-4.1.3-glibc-2.10.patch 3144 RMD160 cee7164d9723e51148a93e1ecd8275a185396a30 SHA1 dc2a9256ee1b77558a1a1205b88120d69d0fa55b SHA256 fe382107a21de01bed87e5b36dab8f3a8b3bc272b1a65a0ff2a37f0b24b23f42
 DIST omniORB-4.0.5.tar.gz 2769030 RMD160 3a14a84342ee7fb53215f766572053233148578f SHA1 e43f9f4946bc7be3fad086dbe8f959287bea94e6 SHA256 a9e5be85d85a7fa71a078069c724f92cb3de02c001cee83944f4e6286581515c
 DIST omniORB-4.1.2.tar.gz 3202157 RMD160 faf72e6bd775a2640530a188f31e0b0474626488 SHA1 6c5f7bd4c82865f921a8a9bec1e3f57dfb529eeb SHA256 7b905e1cdd73046f1592dcd7932d8ec262df94119a22c5ede0dc877470cc12b4
 DIST omniORB-4.1.3.tar.gz 3268141 RMD160 4989cfdf5fb7d81242af8de9db4e3da003394b26 SHA1 7af7181b5b3217287bd8471ab0145cbd729cf988 SHA256 b9668cb4b0f1abe81065d726fac8a3df2e6df7425fee7aa5affbd3699fe52f8a
 EBUILD omniORB-4.0.5.ebuild 1960 RMD160 8879842dd545ab10f164864e8090472cc14c1068 SHA1 5e0eae55d5fe33a1aaca4404dc9c1e735fdf9499 SHA256 edd56499c0d5410d785e56571d0beec943551ee1249c367606ab94149f58fa68
 EBUILD omniORB-4.1.2.ebuild 1983 RMD160 0dfa720fb79a1e0e0303a33307f6aa77060f8de1 SHA1 4c058a93b3b312fc5a9c72e9ef64249d485e0f52 SHA256 c7447c24aec62e7f78dcade901dad7e1b5c3fcc4a693f512b8ca1e7bf92484b4
-EBUILD omniORB-4.1.3.ebuild 2249 RMD160 c42509c034c1424cca47e9fb561b73c5977e55a0 SHA1 a5b5f4f119d99554298442ceb29126f020781744 SHA256 a852a3e6ea13c7d42b22f10c5315f6b04b76494e814e2cd734335be713690a5b
-MISC ChangeLog 8197 RMD160 2e7403429de322e9333c614d2d131fd8a64e9b94 SHA1 6fc9d146f01c9e57eb4e433dcc6251def3aa300d SHA256 e4eb915a43dd31a10adddc4be3d19c45babf386870f01ab9a470f8f5d6271dd8
+EBUILD omniORB-4.1.3.ebuild 2317 RMD160 c3df25f1aebbb1cfeb4db3cb665bd267b46bf7a8 SHA1 de0953efc464c0d4212b5da8163c92c71f441290 SHA256 040f229a1b7695f1a010abf2319063d09b43af5c60ba49d452929c6855fb0fec
+MISC ChangeLog 8413 RMD160 96a23e4466bdf0c672050259a3014e5cf5f46e76 SHA1 3c0e6dabcb34ff63577e6977b83626828bff120d SHA256 44fda20bbacddbd19a9b8f8f2ded984918776032dad5c500b82e981091b8aaa7
 MISC metadata.xml 225 RMD160 106c8f5ff0028efc2beb2d1d065d08e3de1941e3 SHA1 39b11879fb0385ec1afee3995b2d04ba5489f867 SHA256 f27264dffc823378b544553a8bde8fa711cdbd8f06750cc02a4714705e2c81a0
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 \