default to console if use ! gtk && ! use console

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 1cbd46674790faf929911083c4faa434a3c73ed0..4bafc8b1fef8a65d0ea5cece8ae7ed64370833cd 100644 (file)
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.424 2006/12/21 14:06:56 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.425 2006/12/21 17:43:06 gothgirl Exp $
+
+  21 Dec 2006; <gothgirl@gentoo.org> -gaim-2.0.0_beta5.ebuild,
+  gaim-2.0.0_beta5-r1.ebuild:
+  default to console if use ! gtk && ! use console
 
   21 Dec 2006; <gothgirl@gentoo.org> gaim-2.0.0_beta5-r1.ebuild:
   Resolving bug#155404 and bug#158697

diff --git a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
index ffcf73d9b10a6186ffa8350aa42ffb8b00ca10da..4fdd783a528ff62521a1586903955b0f452459ba 100644 (file)
--- a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild,v 1.3 2006/12/21 14:06:56 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild,v 1.4 2006/12/21 17:43:06 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
 
@@ -141,11 +141,10 @@ pkg_setup() {
        fi
 
        if ! use gtk && ! use console; then
-               eerror
-               eerror "You Need to pick either gtk or console, You can have both."
-               eerror "Please enable either gtk or console useflag."
-               eerror
-               die "Configure failed"
+               einfo
+               elog "As you did not pick gtk or console use flag, building"
+               elog "console only."
+               einfo
        fi
 }
 
@@ -210,11 +209,15 @@ src_compile() {
                        myconf="${myconf} --x-includes=/usr/include/X11"
        fi
 
+       if ! use console && ! use gtk; then
+               myconf=${myconf} --enable-consoleui
+       else
+               myconf=${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)
+       fi
+
        econf \
                $(use_enable nls) \
                $(use_enable perl) \
-               $(use_enable gtk gtkui) \
-               $(use_enable console consoleui) \
                $(use_enable startup-notification) \
                $(use_enable tcl) \
                $(use_enable gtk sm) \