--- transmission-1.82.ebuild	2010-01-30 17:06:29.000000000 +0100
+++ transmission-1.83.ebuild	2010-01-30 17:04:34.000000000 +0100
@@ -12,7 +12,7 @@
 LICENSE="MIT GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="+dht gtk libnotify qt4"
+IUSE="canberra cli daemon gtk libnotify qt4"
 
 RDEPEND=">=dev-libs/libevent-1.4.11
 	<dev-libs/libevent-2
@@ -23,7 +23,9 @@
 	gtk? ( >=dev-libs/glib-2.15.5:2
 		>=x11-libs/gtk+-2.12:2
 		>=dev-libs/dbus-glib-0.70
-		libnotify? ( >=x11-libs/libnotify-0.4.3 ) )
+		>=gnome-base/gconf-2.26.0
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		canberra? ( >=media-libs/libcanberra-0.17 ) )
 	qt4? ( x11-libs/qt-gui:4 )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
@@ -32,20 +34,30 @@
 	dev-util/pkgconfig
 	sys-apps/sed"
 
+pkg_setup() {
+	if use cli; then
+		ewarn "The cli version of transmission is considered depreated"
+		ewarn "by the developers. Please use the daemon instead."
+	fi
+}
+
 src_prepare() {
 	sed -e 's:-g -O0::g' -e 's:-g -O3::g' -i configure.ac || die "sed failed"
 	sed -e \
 		's:$${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a:-levent:' \
 		-i qt/qtr.pro || die "sed failed"
+	epatch "${FILESDIR}/${P}-disable-libevent.patch"
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
-		$(use_enable dht) \
 		$(use_enable gtk) \
-		$(use_enable libnotify)
+		$(use_enable libnotify) \
+		$(use_enable canberra libcanberra) \
+		$(use_enable cli) \
+		$(use_enable daemon)
 
 	if use qt4; then
 		cd qt
@@ -68,8 +80,10 @@
 	dodoc AUTHORS NEWS
 	rm -f "${D}"/usr/share/${PN}/web/LICENSE
 
-	newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon
-	newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon
+	if use daemon; then
+		newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon
+		newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon
+	fi
 
 	if use qt4; then
 		cd qt