Drop helpers to find bug#343827, per bug#437346.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

5 files changed, 11 insertions, 74 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index 3005dfff6982..6076ac93310c 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.37 2012/09/24 21:03:50 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.38 2012/10/08 08:26:13 haubi Exp $
+
+  08 Oct 2012; Michael Haubenwallner <haubi@gentoo.org>
+  -files/find-bug343827.patch, mico-2.3.13-r5.ebuild, mico-2.3.13-r6.ebuild,
+  metadata.xml:
+  Drop helpers to find bug#343827, per bug#437346.
 
   24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org> mico-9999.ebuild:
   Update patchset: Drop obsole patches. Avoid the need to resolve hostnames
diff --git a/net-misc/mico/files/find-bug343827.patch b/net-misc/mico/files/find-bug343827.patch
deleted file mode 100644
index df4c8cce21eb..000000000000
--- a/net-misc/mico/files/find-bug343827.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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 e23ab5845815..67ce74da039b 100644
--- a/net-misc/mico/metadata.xml
+++ b/net-misc/mico/metadata.xml
@@ -12,8 +12,5 @@
 		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 18a587a2c345..2c62253127fb 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
+# Copyright 1999-2012 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.2 2011/06/29 11:44:04 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild,v 1.3 2012/10/08 08:26:13 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 findbug"
+IUSE="gtk postgres qt4 ssl tcl threads X"
 RESTRICT="test" #298101
 
 [[ -z ${PATCH_VER} ]] || \
@@ -42,8 +42,6 @@ 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.
@@ -113,11 +111,6 @@ 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"
 
diff --git a/net-misc/mico/mico-2.3.13-r6.ebuild b/net-misc/mico/mico-2.3.13-r6.ebuild
index 29bf86769542..f59403d09749 100644
--- a/net-misc/mico/mico-2.3.13-r6.ebuild
+++ b/net-misc/mico/mico-2.3.13-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r6.ebuild,v 1.1 2012/09/24 20:39:20 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r6.ebuild,v 1.2 2012/10/08 08:26:13 haubi Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ PATCH_VER=0.3
 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 findbug"
+IUSE="gtk postgres qt4 ssl tcl threads X"
 RESTRICT="test" #298101
 
 [[ -z ${PATCH_VER} ]] || \
@@ -42,8 +42,6 @@ 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.
@@ -113,11 +111,6 @@ 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"