upgrade from qt3 to qt4 using Qt3Support. fix some prefix issues.

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

4 files changed, 153 insertions, 3 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index 01e5f5f1e655..18275d767cf6 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mico
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.23 2009/09/28 09:35:28 haubi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.24 2010/01/13 14:09:57 haubi Exp $
+
+*mico-2.3.13-r2 (13 Jan 2010)
+
+  13 Jan 2010; Michael Haubenwallner <haubi@gentoo.org>
+  +mico-2.3.13-r2.ebuild, +files/mico-2.3.13-qt4-nothread.patch:
+  upgrade from qt3 to qt4 using Qt3Support. fix some prefix issues.
 
   28 Sep 2009; Michael Haubenwallner <haubi@gentoo.org>
   mico-2.3.13-r1.ebuild, +files/mico-2.3.13-winnt.patch.bz2:
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 66999c090d54..6560de47e1f3 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -5,8 +5,10 @@ AUX mico-2.3.13-gcc43.patch 752 RMD160 767d448586b2ab8e773f8145ca77f23ea0cf317a
 AUX mico-2.3.13-hpux.patch 689 RMD160 f112e97d1c1c579f9d5010a941584fbf3e247af3 SHA1 18fc7c5012a6a2e358647c2b37e6c73709146794 SHA256 6506bb60fa0514b7a6c232328720d32f0fce44cc53c389793bb4a133c339084c
 AUX mico-2.3.13-nolibcheck.patch 1124 RMD160 557c3588420938cef2365c86ff22a67c6c7594f9 SHA1 ac73d6113a2c0f65c4f6912a8a58e944a3d97d94 SHA256 bbc92cbfa298ac292d80f76859594430c0581af564df9fad7f5870d92fd3d333
 AUX mico-2.3.13-pthread.patch 1317 RMD160 1ef269452add11a18e5c313c126029afb1a110ea SHA1 f226c9882472b574431c39d23a82217f2c253bc9 SHA256 485f1e35fb71643f2d3c1181cd96d75e7c2174fe4cae5d2537a51ad43aa7b8ff
+AUX mico-2.3.13-qt4-nothread.patch 1017 RMD160 f959a969c2260ee0dff511f7ba4780ebedcb4419 SHA1 1a2a4f9677ba2477cd4f62215effb5a5935c721b SHA256 690efc138e8f65a7b39a44e43ba3d197f7b7c229a87caf62e1abef8682398fd2
 AUX mico-2.3.13-winnt.patch.bz2 7453 RMD160 6e89f88ab2fe7e13718e756e993d4aa1dfa73a50 SHA1 340d5a5ee2618e9bda9781e5112c2bf5463f0efe SHA256 5769f5deacbf8d7f29510cc719f895aaba7c21ef43c4ef6942ba7d8387b95ae5
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
 EBUILD mico-2.3.13-r1.ebuild 3795 RMD160 9b7c5847023203cee74d6e8d08761c57685c410f SHA1 c351830badfaaf20526e9459c548fcfbd20c9dcd SHA256 5ba1bf320e5dc44c615d7938ee6790e41c39bc0a93308cfd70dd2d187b987c62
-MISC ChangeLog 1795 RMD160 e85ff2e9d04f99143f08c39226c532c4460db7e8 SHA1 bd672bef14f48dd4049b3b7762d58f6c27b922ea SHA256 0aaac845a8f78825b2ee37febbf3e1b7922a07160b1ba650aacb123bb02a010b
+EBUILD mico-2.3.13-r2.ebuild 4024 RMD160 fd1596f6783e2a6fe5cca44f1b715855c595ca64 SHA1 de6c57a87a3c17f15bdeb5de8582c90d64828000 SHA256 aac2d96a349485d46e661ddcb61e8107b47ebea2390c073068d9b59b60f601e1
+MISC ChangeLog 2016 RMD160 40052877ef73f17d7095e6f912162861660cb7d0 SHA1 7108d7e7b29a155a075dd2f6c740223a6bd61a85 SHA256 f7f2ae362652058f9be5604c041c021097ad12d7956641aece7d56bc6db33f7f
 MISC metadata.xml 640 RMD160 7c861b35cb15bad094830b9e83d0077fb7177a4b SHA1 5426b40b5f7a464c4a4577bef86ab0fcd1be117f SHA256 1f8be72dd1c133d7a282c5e5564466680dff87ed0c5daf688b6dca00327d9f85
diff --git a/net-misc/mico/files/mico-2.3.13-qt4-nothread.patch b/net-misc/mico/files/mico-2.3.13-qt4-nothread.patch
new file mode 100644
index 000000000000..d87c33e45feb
--- /dev/null
+++ b/net-misc/mico/files/mico-2.3.13-qt4-nothread.patch
@@ -0,0 +1,23 @@
+qt4 doesn't provide different libraries for threading.
+--- configure.in.orig	2010-01-12 16:40:06.935594142 +0100
++++ configure.in	2010-01-12 16:40:37.742311509 +0100
+@@ -1124,7 +1124,7 @@
+     AC_MSG_WARN(cannot find moc. QT parts disabled.)
+     HAVE_QT=no
+   fi
+-  if test X"$HAVE_THREADS" = Xyes; then
++  if false && test X"$HAVE_THREADS" = Xyes; then
+     AC_CHECK_LIB(qt-mt, open, qt_mt=yes, qt_mt=no)
+     if test X"$qt_mt" = Xno; then
+       AC_MSG_WARN(cannot find multi-threaded version of QT library. QT parts disabled.)
+--- configure.orig	2010-01-12 16:40:11.555621774 +0100
++++ configure	2010-01-12 16:40:51.125633810 +0100
+@@ -4197,7 +4197,7 @@
+     echo "configure: warning: cannot find moc. QT parts disabled." 1>&2
+     HAVE_QT=no
+   fi
+-  if test X"$HAVE_THREADS" = Xyes; then
++  if false && test X"$HAVE_THREADS" = Xyes; then
+     echo $ac_n "checking for open in -lqt-mt""... $ac_c" 1>&6
+ echo "configure:4189: checking for open in -lqt-mt" >&5
+ ac_lib_var=`echo qt-mt'_'open | sed 'y%./+-%__p_%'`
diff --git a/net-misc/mico/mico-2.3.13-r2.ebuild b/net-misc/mico/mico-2.3.13-r2.ebuild
new file mode 100644
index 000000000000..924d18847e28
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r2.ebuild
@@ -0,0 +1,119 @@
+# 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-r2.ebuild,v 1.1 2010/01/13 14:09:57 haubi Exp $
+
+EAPI="2"
+
+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"
+
+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"
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez-libs )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql )
+	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 "${FILESDIR}"/${P}-nolibcheck.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-pthread.patch
+	epatch "${FILESDIR}"/${P}-aix.patch
+	epatch "${FILESDIR}"/${P}-hpux.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch #280678
+	epatch "${FILESDIR}"/${P}-qt4-nothread.patch
+
+	[[ ${CHOST} == *-winnt* ]] && epatch "${FILESDIR}"/${P}-winnt.patch.bz2
+
+	# 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
+		# set up gtk-1 wrapper for gtk-2
+		mkdir "${T}"/path || die "failed to create temporary path"
+		cp "${FILESDIR}"/gtk-config "${T}"/path || die "failed to dupe gtk-config"
+		chmod +x "${T}"/path/gtk-config || die "failed to arm gtk-config"
+		export PATH="${T}"/path:${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 winopts=
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		winopts="${winopts} --disable-threads --disable-static --enable-final"
+		append-flags -D__STDC__
+	fi
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	# '--without-*' or '--with-*=no' does not disable some features, the value
+	# needs to be empty instead. This applies to: bluetooth, gtk, pgsql, qt, tcl.
+	# But --without-x works.
+
+	# bluetooth and wireless both don't compile cleanly
+	econf \
+		--disable-mini-stl \
+		$(use_enable threads) \
+		--with-gtk=$(use gtk && echo "${EPREFIX}"/usr) \
+		--with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) \
+		--with-qt=$(use qt4 && echo "${EPREFIX}"/usr) \
+		--with-tcl=$(use tcl && echo "${EPREFIX}"/usr) \
+		$(use_with X x "${EPREFIX}"/usr) \
+		--with-bluetooth='' \
+		--disable-wireless \
+		${winopts}
+}
+
+src_install() {
+	emake INSTDIR="${D}${EPREFIX}"/usr SHARED_INSTDIR="${D}${EPREFIX}"/usr install LDCONFIG=: || die "install failed"
+
+	dodir /usr/share || die
+	mv "${D}${EPREFIX}"/usr/man "${D}${EPREFIX}"/usr/share || die
+	dodir /usr/share/doc/${PF} || die
+	mv "${D}${EPREFIX}"/usr/doc "${D}${EPREFIX}"/usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO || die
+}