--- gaim-2.0.0_beta5.ebuild	2006-11-12 05:36:07.000000000 +0900
+++ gaim-2.0.0_beta5.ebuild	2006-11-18 00:02:38.000000000 +0900
@@ -15,20 +15,27 @@
 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 spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu"
+IUSE="${IUSE} gtk ncurses sasl session-management "
 
 RDEPEND="
 	bonjour? ( !avahi? ( net-misc/howl )
 		   avahi? ( net-dns/avahi ) )
 	dbus? ( >=sys-apps/dbus-0.35
 		>=dev-lang/python-2.4 )
-	>=x11-libs/gtk+-2.0
+	ncurses? ( sys-libs/ncurses )
+	gtk? (
+		>=x11-libs/gtk+-2.0
+		session-management? ( x11-libs/libICE x11-libs/libSM )
+		spell? ( >=app-text/gtkspell-2.0.2 )
+		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 )
@@ -40,13 +47,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
@@ -137,6 +143,14 @@
 	eerror
 	die "Configure failed"
 	fi
+
+	if use ncurses && ! 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
 }
 
 src_unpack() {
@@ -203,16 +217,20 @@
 		$(use_enable nls) \
 		$(use_enable perl) \
 		$(use_enable spell gtkspell) \
+		$(use_enable gtk gtkui) \
+		$(use_enable ncurses consoleui) \
 		$(use_enable startup-notification) \
 		$(use_enable tcl) \
 		$(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 session-management sm) \
 		$(use_enable gstreamer) \
+		$(use_enable sasl cyrus-sasl ) \
 		$(use_enable doc doxygen) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		${myconf} " || die "Configuration failed"