EAPI 3 bump. Listen to CFLAGS/CXXFLAGS. Better grouping of econf options.

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

3 files changed, 134 insertions, 2 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index d33824e951ef..6d71ca8341ab 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.29 2010/08/16 15:15:40 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.30 2010/12/01 09:57:46 haubi Exp $
+
+*mico-2.3.13-r4 (29 Nov 2010)
+
+  29 Nov 2010; Michael Haubenwallner <haubi@gentoo.org>
+  +mico-2.3.13-r4.ebuild:
+  EAPI 3 bump. Listen to CFLAGS/CXXFLAGS. Better grouping of econf options.
 
   16 Aug 2010; Michael Haubenwallner <haubi@gentoo.org>
   mico-2.3.13-r3.ebuild, -files/mico-2.3.13-aix.patch,
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 04a247993a22..0a794d0fe08c 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,5 +1,6 @@
 DIST mico-2.3.13-gentoo-patches-0.1.tar.bz2 10142 RMD160 d881d21a8d9bb65b46b086d52c55a5f99f135fa5 SHA1 e4fb0fe33d149151f03f9314863158a23ebc2b2c SHA256 87a4d2440ac4ff78054f4435df4f1ebb7a26ece8b31a708ed2a4aafa833b7205
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
 EBUILD mico-2.3.13-r3.ebuild 3650 RMD160 8ec97caa0df1b56b1315483a05114c4d8b3ac652 SHA1 7a8f1a7d6948d115cdbe537977f576d96b00f8b5 SHA256 47255bc486d37ce5e773b0fc7b2038aa8e2ef63b8e65c87e978a76af8ad77d30
-MISC ChangeLog 3296 RMD160 fef1aa13ce0c8cf5226615f7a26dd3f3efa8f12b SHA1 8968a7066602b95ac1b5bc85195171ec4711ecb3 SHA256 c898a452b8eb8efe16e2c78127bf1b4cdb82ed94c56b3dc7c57cbf663d2b8943
+EBUILD mico-2.3.13-r4.ebuild 3943 RMD160 36ae94175783c3fbe441e0dffcefe579bd886dde SHA1 ecc3e513c59352a1f2407af9322a26505901bef0 SHA256 b3d51067ae3e7782de202fa9ab98741053ac0e134a9f93bc4f76a830e8c0726f
+MISC ChangeLog 3486 RMD160 5087a00a64d0448f4023eb74c2c893c7af607afa SHA1 fae20851cd9b0e8e33bab8a6be9a7e935c381e0e SHA256 79633a01b648c007ab403b6991df7afe28319cd89540b06ad13f3d7a31dd82f4
 MISC metadata.xml 640 RMD160 7c861b35cb15bad094830b9e83d0077fb7177a4b SHA1 5426b40b5f7a464c4a4577bef86ab0fcd1be117f SHA256 1f8be72dd1c133d7a282c5e5564466680dff87ed0c5daf688b6dca00327d9f85
diff --git a/net-misc/mico/mico-2.3.13-r4.ebuild b/net-misc/mico/mico-2.3.13-r4.ebuild
new file mode 100644
index 000000000000..62429c11f1cc
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2010 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-r4.ebuild,v 1.1 2010/12/01 09:57:46 haubi Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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.1
+
+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"
+RESTRICT="test" #298101
+
+[[ -z ${PATCH_VER} ]] || \
+	SRC_URI="${SRC_URI} mirror://gentoo/${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
+
+	# 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
+
+	# stop struggling with '-g' and '-O*' in CFLAGS/CXXFLAGS
+	sed -i -e '/^CFLAGS=.*sed/d;/^CXXFLAGS=.*sed/d;/use_opt=/s/yes/no/' configure ||
+		die "cannot stop struggling with CFLAGS/CXXFLAGS"
+
+	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_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
+}