Add new cleaned up ebuild by Graham Hudspith <gwh@allinea.com> (adds Qt, Gtk

and Postgresql support). Add build fix by Malcolm MacLeod
<mmacleod@webmail.co.za>. Both bug #56798.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 102 insertions, 5 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index 3eaa51f06ae1..77e5fb542e14 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/mico
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.10 2004/12/29 19:54:54 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.11 2005/08/04 20:33:58 azarah Exp $
+
+*mico-2.3.11-r1 (04 Aug 2005)
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mico-2.3.11-build-fix.patch, +mico-2.3.11-r1.ebuild:
+  Add new cleaned up ebuild by Graham Hudspith <gwh@allinea.com> (adds Qt, Gtk
+  and Postgresql support). Add build fix by Malcolm MacLeod
+  <mmacleod@webmail.co.za>. Both bug #56798.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index b84720198cbc..0bd5d0ce7fe4 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,7 +1,20 @@
-MD5 33e7b2cebf65405b03ada7de89b50e0d ChangeLog 1292
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b1844ac1bb6944034afb8e9f3a600a8f ChangeLog 1621
+MD5 e12517e602ea525c7d741d5823d4797c mico-2.3.7.ebuild 1394
+MD5 17cf184ba5954b217b43429ecf2592d2 mico-2.3.11-r1.ebuild 1747
 MD5 611907b50de48923e75c344440d00480 mico-2.3.9.ebuild 1401
 MD5 9c8bb11952bdec1927f572db4af5d8ad mico-2.3.11.ebuild 1409
-MD5 e12517e602ea525c7d741d5823d4797c mico-2.3.7.ebuild 1394
 MD5 67a6622b9fa3dc37121f3a43f0234f79 files/digest-mico-2.3.11 64
-MD5 92deafe718f5328130a6a1238621343d files/digest-mico-2.3.7 63
+MD5 67a6622b9fa3dc37121f3a43f0234f79 files/digest-mico-2.3.11-r1 64
 MD5 e08b36b538bb6b3739f116f5219e17b9 files/digest-mico-2.3.9 63
+MD5 92deafe718f5328130a6a1238621343d files/digest-mico-2.3.7 63
+MD5 6d29929690decb760ef768a999c93bdf files/mico-2.3.11-build-fix.patch 353
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFC8nvi1ZcsMnZjRyIRAqn0AJ4ycCJVHQzI9LMa64YdgaFDm17m7gCYvipc
+ltKt647Q53qvnq8cCu/LZA==
+=Xgti
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mico/files/digest-mico-2.3.11-r1 b/net-misc/mico/files/digest-mico-2.3.11-r1
new file mode 100644
index 000000000000..03dd201c7c8e
--- /dev/null
+++ b/net-misc/mico/files/digest-mico-2.3.11-r1
@@ -0,0 +1 @@
+MD5 669d98ec5da2f6c50937a2a25e797eec mico-2.3.11.tar.gz 2523850
diff --git a/net-misc/mico/files/mico-2.3.11-build-fix.patch b/net-misc/mico/files/mico-2.3.11-build-fix.patch
new file mode 100644
index 000000000000..84ac34ff8dbd
--- /dev/null
+++ b/net-misc/mico/files/mico-2.3.11-build-fix.patch
@@ -0,0 +1,10 @@
+diff -urN mico.orig/cpp/Makefile mico/cpp/Makefile
+--- mico.orig/cpp/Makefile	2003-10-13 11:49:24.000000000 +0200
++++ mico/cpp/Makefile	2005-06-10 11:04:16.147683648 +0200
+@@ -73,5 +73,5 @@
+ 
+ .depend :
+ 	echo '# Module dependencies' > .depend
+-	$(MKDEPEND) $(CPPFLAGS) $(CXXFLAGS) *.c >> .depend
++	$(MKDEPEND) $(CPPFLAGS) $(CXXFLAGS) *.cc >> .depend
+ 
diff --git a/net-misc/mico/mico-2.3.11-r1.ebuild b/net-misc/mico/mico-2.3.11-r1.ebuild
new file mode 100644
index 000000000000..384ea094c02e
--- /dev/null
+++ b/net-misc/mico/mico-2.3.11-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.11-r1.ebuild,v 1.1 2005/08/04 20:33:58 azarah Exp $
+
+inherit eutils
+
+IUSE="ssl tcltk qt gtk postgres"
+
+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"
+
+DEPEND="virtual/libc
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+	ssl? ( dev-libs/openssl )
+	tcltk? ( dev-lang/tcl )
+	qt? ( x11-libs/qt )
+	postgres? ( dev-db/postgresql )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-build-fix.patch
+}
+
+src_compile() {
+	local myopts="--enable-final
+		--disable-mini-stl"
+#		--enable-life
+#		--enable-externalize"
+
+	use ssl && myopts="${myopts} --with-ssl=/usr" \
+		|| myopts="${myopts} --without-ssl"
+	use tcltk && myopts="${myopts} --with-tcl=/usr" \
+		|| myopts="${myopts} --without-tcl"
+	use qt && myopts="${myopts} --with-qt=${QTDIR}" \
+		|| myopts="${myopts} --without-qt"
+	use gtk && myopts="${myopts} --with-gtk=/usr" \
+		|| myopts="${myopts} --without-gtk"
+	use postgres && myopts="${myopts} --with-pgsql=/usr" \
+		|| myopts="${myopts} --without-pgsql"
+
+	econf ${myopts} || die "configure failed"
+
+	# Rather not emake here, as is a memory hog
+	make || die "make failed"
+}
+
+src_install() {
+	make INSTDIR=${D}/usr SHARED_INSTDIR=${D}/usr install || die
+
+	dodir /usr/share/
+	mv ${D}/usr/man ${D}/usr/share
+	dodir /usr/share/doc/
+	mv ${D}/usr/doc ${D}/usr/share/doc/${P}
+
+	dodoc CHANGES* CONVERT FAQ INSTALL* LICENSE* MANIFEST README* ROADMAP TODO VERSION
+}