Index: gaim-2.0.0_beta5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5.ebuild,v
retrieving revision 1.3
diff -u -B -r1.3 gaim-2.0.0_beta5.ebuild
--- gaim-2.0.0_beta5.ebuild	18 Nov 2006 07:42:50 -0000	1.3
+++ gaim-2.0.0_beta5.ebuild	20 Dec 2006 03:32:15 -0000
@@ -15,7 +15,8 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu"
+IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu"
+IUSE="${IUSE} gtk sasl console"
 
 RDEPEND="
 	bonjour? ( !avahi? ( net-misc/howl )
@@ -25,13 +26,15 @@
 				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
 				)
 		>=dev-lang/python-2.4 )
-	>=x11-libs/gtk+-2.0
+ 	gtk? (
+ 		>=x11-libs/gtk+-2.0
+ 		startup-notification? ( >=x11-libs/startup-notification-0.5 )
+ 		xscreensaver? (	x11-libs/libXScrnSaver )
+ 		eds? ( gnome-extra/evolution-data-server ) 	)
 	>=dev-libs/glib-2.0
 	gstreamer? ( media-libs/gstreamer
 		     media-libs/gst-plugins-good )
-	nas? ( >=media-libs/nas-1.4.1-r1 )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
 	gadu?  ( net-libs/libgadu )
 	ssl? (
 		gnutls? ( net-libs/gnutls )
@@ -43,13 +46,12 @@
 	)
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	eds? ( gnome-extra/evolution-data-server )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
-	startup-notification? ( >=x11-libs/startup-notification-0.5 )
 	mono? ( dev-lang/mono )
+	gstreamer? ( >=media-libs/gstreamer-0.10 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
 	doc? ( app-doc/doxygen )
-	xscreensaver? (	x11-libs/libXScrnSaver )
 	dev-libs/libxml2"
 
 DEPEND="$RDEPEND
@@ -61,7 +63,7 @@
 S="${WORKDIR}/${MY_PV}"
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,msn,oscar,yahoo,zephyr,simple"
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
 
 # List of plugins
 #   app-accessibility/festival-gaim
@@ -110,16 +112,6 @@
 		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
 		einfo
 	fi
-
-	if use silc; then
-		einfo "To be able to connect to silc network, you need to run"
-		einfo "\`usermod -c \"comment\"\` as user as which you are running gaim,"
-		einfo "where \"comment\" is either your real name if you want show it"
-		einfo "on silc or any othe not empty string."
-		einfo
-	fi
-	ebeep 5
-	epause 3
 }
 
 pkg_setup() {
@@ -127,25 +119,39 @@
 
 	if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then
 	eerror
-	eerror You need to rebuild net-dns/avahi with USE=howl-compat in order
-	eerror to enable howl support for the bonjour protocol in gaim.
+	eerror "You need to rebuild net-dns/avahi with USE=howl-compat in order"
+	eerror  "to enable howl support for the bonjour protocol in gaim."
 	eerror
 	die "Configure failed"
 	fi
 
 	if use gadu && built_with_use net-libs/libgadu ssl ; then
 	eerror
-	eerror You need to rebuild net-libs/libgadu with USE=-ssl in order
-	eerror enable gadu gadu support in gaim.
+	eerror "You need to rebuild net-libs/libgadu with USE=-ssl in order"
+	eerror "enable gadu gadu support in gaim."
 	eerror
 	die "Configure failed"
 	fi
+
+	if use console &&  ! built_with_use sys-libs/ncurses unicode; then
+		eerror
+		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
+		eerror "to build the console client of gaim."
+		eerror
+		die "Configure failed"
+	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"
+	fi
 }
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch "${FILESDIR}"/"${P}"-dbus.patch
-	eautomake
 }
 
 src_compile() {
@@ -182,6 +188,9 @@
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
 	fi
 
+	if use msn; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
+	fi
 
 	if use ssl || use msn ; then
 		if use gnutls ; then
@@ -205,24 +214,28 @@
 	G2CONF=" \
 		$(use_enable nls) \
 		$(use_enable perl) \
-		$(use_enable spell gtkspell) \
+		$(use_enable gtk gtkui) \
+		$(use_enable console consoleui) \
 		$(use_enable startup-notification) \
 		$(use_enable tcl) \
+		$(use_enable gtk sm) \
+		$(use_enable gtk gtkspell) \
 		$(use_enable tk) \
+		$(use_enable xscreensaver screensaver) \
 		$(use_enable mono) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \
-		$(use_enable nas) \
 		$(use_enable eds gevolution) \
 		$(use_enable gstreamer) \
+		$(use_enable sasl cyrus-sasl ) \
 		$(use_enable doc doxygen) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		${myconf} " || die "Configuration failed"
 
 	# This is a tempory fix until Makefile is fixed!!
 	if use mono; then
-	MAKEOPTS="-j1"	gnome2_src_compile || die "Make failed"
+		gnome2_src_compile -j1 || die "Make failed"
 	else
 		gnome2_src_compile || die "Make failed"
 	fi