--- /usr/portage/tree/net-p2p/btg/btg-0.9.7.ebuild	2008-06-20 19:28:42.000000000 +0200
+++ btg-0.9.8.ebuild	2008-07-10 01:21:58.000000000 +0200
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/btg-0.9.7.ebuild,v 1.1 2008/06/20 17:28:42 angelos Exp $
+# $Header:
 
-EAPI=1
+EAPI="1"
 
-inherit eutils flag-o-matic
+inherit eutils
 
 DESCRIPTION="bittorrent client using rb_libtorrent"
 HOMEPAGE="http://btg.berlios.de/"
@@ -13,35 +13,28 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc event-callback gtk minimal ncurses session test webinterface"
+IUSE="curl debug doc event-callback gtk minimal ncurses session test webinterface"
 
-RDEPEND=">=dev-libs/boost-1.34.1
+RDEPEND=">=dev-libs/boost-1.35
 	dev-libs/expat
 	dev-libs/libgcrypt
 	dev-libs/libgpg-error
 	dev-libs/libtasn1
-	dev-util/dialog
 	net-libs/gnutls
-	>=net-libs/rb_libtorrent-0.13_rc1
+	>=net-libs/rb_libtorrent-0.12.1
+	curl? ( >=net-misc/curl-7.15.5 )
+	ncurses? ( sys-libs/ncurses:5 )
 	gtk? ( dev-cpp/gtkmm:2.4
-		dev-libs/libsigc++:2
+		=dev-libs/libsigc++-2.0*
 		x11-libs/pango )
+	!minimal? ( dev-util/dialog )
 	test? ( dev-util/cppunit )
 	webinterface? ( =dev-lang/php-5* virtual/httpd-cgi )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.21
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-broken_bundled_plotmm_sigc.patch
-}
-
 src_compile() {
-	filter-ldflags -Wl,--as-needed --as-needed
-
 	econf \
 		$(use_enable debug) \
 		$(use_enable gtk gui) \
@@ -50,17 +43,19 @@
 		$(use_enable session session-saving) \
 		$(use_enable test unittest) \
 		$(use_enable webinterface www) \
+		$(use_enable curl url) \
 		$(use_enable !minimal command-list) \
-		--enable-btg-config \
+		$(use_enable !minimal btg-config) \
 		--disable-upnp \
+		--disable-viewer \
 		--disable-dependency-tracking \
-		|| die
+		|| die "econf failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS ChangeLog README TODO