mico-2.3.13-r5: try to find bug#343827 via extra patch upon USE=findbug

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 68 insertions, 3 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index a4dacd759e01..bb1faa9df373 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.34 2011/05/26 20:47:56 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.35 2011/06/29 11:44:04 haubi Exp $
+
+  29 Jun 2011; Michael Haubenwallner <haubi@gentoo.org>
+  +files/find-bug343827.patch, mico-2.3.13-r5.ebuild, metadata.xml:
+  try to find bug#343827 via extra patch upon USE=findbug
 
   26 May 2011; Michael Haubenwallner <haubi@gentoo.org> mico-9999.ebuild:
   err, do not try to trigger the description problem
diff --git a/net-misc/mico/files/find-bug343827.patch b/net-misc/mico/files/find-bug343827.patch
new file mode 100644
index 000000000000..df4c8cce21eb
--- /dev/null
+++ b/net-misc/mico/files/find-bug343827.patch
@@ -0,0 +1,51 @@
+--- orb/address.cc.orig	2011-06-28 17:22:58.275355766 +0200
++++ orb/address.cc	2011-06-28 17:46:12.268357549 +0200
+@@ -269,21 +269,30 @@
+ {
+     if (_ipaddr.size() > 0)
+ 	return TRUE;
+-    if (_host.length() == 0)
++
++    if (_host.length() == 0) {
++::std::cerr << "for gentoo bug#343827: resolve_ip() detected _host.length() == 0, failed." << ::std::endl;
+ 	return FALSE;
++    }
+ 
+     InetAddress &me = (InetAddress &)*this;
+ 
++::std::cerr << "for gentoo bug#343827: resolve_ip() for hostname '" << _host << "' using ::inet_addr()...";
++
+     CORBA::ULong addr = ::inet_addr ((char *)_host.c_str());
+     if (addr != (CORBA::ULong)-1L || _host == string("255.255.255.255")) {
+ 	me._ipaddr.insert (me._ipaddr.begin(),
+ 			   (CORBA::Octet *)&addr,
+ 			   (CORBA::Octet *)&addr + sizeof (CORBA::ULong));
++::std::cerr << " succeeded." << ::std::endl;
+ 	return TRUE;
+     }
++::std::cerr << " failed, using ::gethostbyname() ";
+ #ifndef HAVE_THREADS
++::std::cerr << "without threads...";
+     struct hostent *hent = ::gethostbyname ((char *)_host.c_str());
+ #else // HAVE_THREADS
++::std::cerr << "with threads...";
+     struct hostent* hent = NULL;
+     {
+         MICOMT::AutoLock lock(S_netdb_lock_);
+@@ -293,6 +302,7 @@
+         me._ipaddr.insert (me._ipaddr.begin(),
+                            (CORBA::Octet *)hent->h_addr,
+                            (CORBA::Octet *)hent->h_addr + hent->h_length);
++::std::cerr << " succeeded." << ::std::endl;
+         return TRUE;
+     }
+ #ifdef HAVE_THREADS
+@@ -305,6 +315,8 @@
+ 	<< "Warning: cannot resolve hostname '" << _host
+ 	<< "' into an IP address." << endl;
+     }
++
++::std::cerr << " failed." << ::std::endl;
+     return FALSE;
+ }
+ 
diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml
index 12c76754a6be..e99010bd661c 100644
--- a/net-misc/mico/metadata.xml
+++ b/net-misc/mico/metadata.xml
@@ -13,5 +13,8 @@
 		renowned for its market-leading security features, its great
 		user-friendliness, and its full standard-compliance.
 	</longdescription>
+	<use>
+		<flag name="findbug">Adds patch to help finding bug#343827</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/net-misc/mico/mico-2.3.13-r5.ebuild b/net-misc/mico/mico-2.3.13-r5.ebuild
index 95f0f9a9fec5..18a587a2c345 100644
--- a/net-misc/mico/mico-2.3.13-r5.ebuild
+++ b/net-misc/mico/mico-2.3.13-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild,v 1.1 2011/05/26 09:46:17 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild,v 1.2 2011/06/29 11:44:04 haubi Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ PATCH_VER=0.2
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
+IUSE="gtk postgres qt4 ssl tcl threads X findbug"
 RESTRICT="test" #298101
 
 [[ -z ${PATCH_VER} ]] || \
@@ -42,6 +42,8 @@ S=${WORKDIR}/${PN}
 src_prepare() {
 	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
 
+	use findbug && epatch "${FILESDIR}"/find-bug343827.patch
+
 	eautoreconf
 
 	# cannot use big TOC (AIX only), gdb doesn't like it.
@@ -111,6 +113,11 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	use findbug && export EXTRA_EMAKE="${EXTRA_EMAKE} -j1"
+	default
+}
+
 src_install() {
 	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: || die "install failed"