Avoid the need to resolve hostnames within idl-compiler, bug#343827.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 145 insertions, 10 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index bb1faa9df373..ebb8d857a27c 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2011/06/29 11:44:04 haubi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.36 2012/09/24 20:39:20 haubi Exp $
+
+*mico-2.3.13-r6 (24 Sep 2012)
+
+  24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org> +mico-2.3.13-r6.ebuild:
+  Avoid the need to resolve hostnames within idl-compiler, bug#343827.
 
   29 Jun 2011; Michael Haubenwallner <haubi@gentoo.org>
   +files/find-bug343827.patch, mico-2.3.13-r5.ebuild, metadata.xml:
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 65b90985c42f..4ea8e4e55222 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX find-bug343827.patch 1682 RMD160 8739dc6e32e348445a9c7525ca633180420b3ee1 SHA1 de11d77241feb4036189a57409d9a956a9ad3a23 SHA256 65a3fdd6343305b7965a2ef6182e5b99b23209b89cc7db6fc5b5b13f20c2d0b1
 DIST mico-2.3.13-gentoo-patches-0.1.tar.bz2 10142 RMD160 d881d21a8d9bb65b46b086d52c55a5f99f135fa5 SHA1 e4fb0fe33d149151f03f9314863158a23ebc2b2c SHA256 87a4d2440ac4ff78054f4435df4f1ebb7a26ece8b31a708ed2a4aafa833b7205
 DIST mico-2.3.13-gentoo-patches-0.2.tar.bz2 8870 RMD160 0e838aee0d4dc34ea64843aa248790e391570744 SHA1 d4c0288f8ef6534d20fd63c0ca6e2dc26060b489 SHA256 344a7cf4a863476b5d7e630566e0d9fe592bc0329a5815e8d77a1cade2b72f61
+DIST mico-2.3.13-gentoo-patches-0.3.tar.bz2 9547 RMD160 07f17c1fa289af57d72d2b4b0fcb6c02d173e7c2 SHA1 39e600e7be37bcaeefa21e96dcc2516b6be02a36 SHA256 4d76e7e696ac4af60dc40ecc81d3a142cbec410c2e1b9155270a7865e71afca4
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
 DIST mico-9999-gentoo-patches-20110526.tar.bz2 8718 RMD160 3c3f191983fe5cc367f1de9d031059e877f9852a SHA1 8e87600ef92e42423a03f736982df52b57de5ad5 SHA256 de8295b480cc21cdb01f5a6b35010c51e82ddf130564dd941a8be9b3f0a1885b
 EBUILD mico-2.3.13-r4.ebuild 3943 RMD160 36ae94175783c3fbe441e0dffcefe579bd886dde SHA1 ecc3e513c59352a1f2407af9322a26505901bef0 SHA256 b3d51067ae3e7782de202fa9ab98741053ac0e134a9f93bc4f76a830e8c0726f
 EBUILD mico-2.3.13-r5.ebuild 3948 RMD160 86690ca988448804cb62290c6802090d1140009d SHA1 3ef2358f9ac10f8af67002992447773e9fd83137 SHA256 b5e0ff30a1f9370b101ff56eafc11e72c733b71592addaca9d10086253c1b5fd
+EBUILD mico-2.3.13-r6.ebuild 3948 RMD160 f0fae2c64608899758bf32e07d2c66fdd78f879e SHA1 297e6bd0b8655579c01e06ed8f531afc271a2948 SHA256 e3d930eebd852f68a3c3faba172eba6c2729ffd4a0109dc53ebda930884fd516
 EBUILD mico-9999.ebuild 3895 RMD160 0aa373fe72c498a4540c55a64788a1a95c589e38 SHA1 f2c7946d2831438b075b1ca412ad75e366a1950e SHA256 22d4ab2eacc3b0a07bf5225f750acf9cd03c1a057b78944221015ae1acad833d
-MISC ChangeLog 4401 RMD160 7328eaffe6e6c13e513e78fe1ad70c0023af770d SHA1 026bda562cd4146b2c9395a00235ab4d6cba1106 SHA256 a811e9e417255342bfac7244156dbe32fb0746b0c6da963cee233a01170534f1
+MISC ChangeLog 4584 RMD160 81cc1c35aa260b0b692c8aaac505bb173ebdf820 SHA1 80269a319993e7fa2e38fa4b0f204c9516c1e2d9 SHA256 38c41f7394ba5e9d110e7b8a6eb44048738a6c168b78970fa6c7b505f816991b
 MISC metadata.xml 701 RMD160 5a5ff706411ad1150aeca368c2fa09f0473e057a SHA1 89bc1a5c5c372608c72dafb7e4882be2e69764a3 SHA256 f98f60a582893996d435228123bc5b9f2f590c7144845da1135adae1623d6022
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rSEACgkQfXuS5UK5QB212wP+Ka2baBR5ElkRsrzreU7mz0f1
-ZVRXdTU22TukBUN6qoDXZVikEOgidPY5cZcneY2kSwXmQIKsSB5G/JJy5X+ZYcGX
-MDWeX+5g0p0fe2wRNmhhlU9/LEEdwDYtIhCvCHZWzN83baRIukeEY3L4zUebZn4h
-RoP69Lb+udvpKm1j3Pc=
-=FhPf
+iEYEARECAAYFAlBgxQAACgkQLc0TWKYwzLi/AgCcD32d2FJMbGxjKnP7fWnjshUJ
+w2AAnjzHAnLVm3g0VmO2QYffXk9Ux0kG
+=k64p
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mico/mico-2.3.13-r6.ebuild b/net-misc/mico/mico-2.3.13-r6.ebuild
new file mode 100644
index 000000000000..29bf86769542
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r6.ebuild
@@ -0,0 +1,130 @@
+# 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 $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+SRC_URI="http://www.mico.org/${P}.tar.gz"
+
+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"
+RESTRICT="test" #298101
+
+[[ -z ${PATCH_VER} ]] || \
+	SRC_URI="${SRC_URI} http://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.bz2"
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql-base )
+	qt4?       ( x11-libs/qt-gui:4[qt3support] )
+	ssl?       ( dev-libs/openssl )
+	tcl?       ( dev-lang/tcl )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+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.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure
+
+	if use qt4; then
+		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
+			die "cannot update to use Qt3Support of qt4"
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	if use gtk; then
+		# need gtk-1 wrapper for gtk-2
+		export PATH="${WORKDIR}"/helpers:${PATH}
+	fi
+
+	# Don't know which version of JavaCUP would suffice, but there is no
+	# configure argument to disable checking for JavaCUP.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
+	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
+	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
+	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
+	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
+	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
+	# bluetooth and wireless both don't compile cleanly
+	myconf --with-bluetooth=''
+	myconf --disable-wireless
+	# But --without-x works.
+	myconf $(use_with X x "${EPREFIX}"/usr)
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	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"
+
+	dodir /usr/share || die
+	mv "${ED}"usr/man "${ED}"usr/share || die
+	dodir /usr/share/doc/${PF} || die
+	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO || die
+}