diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2012-09-24 21:03:50 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2012-09-24 21:03:50 +0000 |
| commit | 0844e924ae5e1598ed7868e4131bd193c62d2019 (patch) | |
| tree | 2ec86761ea52593936a755dbd0355573031d5d18 /net-misc | |
| parent | version bump (diff) | |
| download | gentoo-2-0844e924ae5e1598ed7868e4131bd193c62d2019.tar.gz gentoo-2-0844e924ae5e1598ed7868e4131bd193c62d2019.tar.bz2 gentoo-2-0844e924ae5e1598ed7868e4131bd193c62d2019.zip | |
Update patchset: Drop obsole patches. Avoid the need to resolve hostnames within idl-compiler, bug#343827. Search for gtk releases by major number, can drop the gtk-1 wrapper. But still does not support gtk-3.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/mico/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/mico/mico-9999.ebuild | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog index ebb8d857a27c..3005dfff6982 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.36 2012/09/24 20:39:20 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.37 2012/09/24 21:03:50 haubi Exp $ + + 24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org> mico-9999.ebuild: + Update patchset: Drop obsole patches. Avoid the need to resolve hostnames + within idl-compiler, bug#343827. Search for gtk releases by major number, can + drop the gtk-1 wrapper. But still does not support gtk-3. *mico-2.3.13-r6 (24 Sep 2012) diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild index acc1dba568d3..d346946c187e 100644 --- a/net-misc/mico/mico-9999.ebuild +++ b/net-misc/mico/mico-9999.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-9999.ebuild,v 1.3 2011/05/26 20:47:56 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-9999.ebuild,v 1.4 2012/09/24 21:03:50 haubi Exp $ EAPI="3" @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then inherit darcs fi -PATCH_VER=20110526 +PATCH_VER=20120924 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" HOMEPAGE="http://www.mico.org/" @@ -71,11 +71,6 @@ src_prepare() { 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'. @@ -98,8 +93,7 @@ src_configure() { # '--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) + # This applies to: pgsql, qt, tcl, bluetooth. myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr) myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) @@ -108,6 +102,8 @@ src_configure() { myconf --disable-wireless # But --without-x works. myconf $(use_with X x "${EPREFIX}"/usr) + # Same for gtk after patch 013, searches for gtk release. + myconf $(use_with gtk gtk 2) # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED |