--- btg-0.9.7.ebuild	2009-01-27 19:56:33.000000000 -0500
+++ btg-0.9.9_rc1.ebuild	2009-01-27 20:00:18.000000000 -0500
@@ -1,48 +1,51 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2008/09/11 11:44:58 pvdabeel Exp $
+# $Header: $
 
-EAPI=1
+EAPI="2"
 
-inherit eutils flag-o-matic
+inherit eutils versionator
 
+MY_PV=$(replace_version_separator _ '-' )
+MY_P="${PN}-${MY_PV}"
 DESCRIPTION="bittorrent client using rb_libtorrent"
 HOMEPAGE="http://btg.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~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
-	dev-libs/expat
+RDEPEND=">=dev-libs/boost-1.33
+	>=dev-libs/expat-1.95.8
 	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/gnutls-1.0
+	>=net-libs/rb_libtorrent-0.12.1
+	!>=net-libs/rb_libtorrent-0.15
+	curl? ( >=net-misc/curl-7.15.5 )
 	gtk? ( dev-cpp/gtkmm:2.4
 		dev-libs/libsigc++:2
 		x11-libs/pango )
+	!minimal? ( dev-util/dialog )
+	ncurses? ( sys-libs/ncurses:5 )
 	test? ( dev-util/cppunit )
-	webinterface? ( =dev-lang/php-5* virtual/httpd-cgi )"
+	webinterface? ( =dev-lang/php-5*[xml,zlib] 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
-}
+S="${WORKDIR}/${PN}-${PV/_rc*/}"
 
 src_compile() {
-	filter-ldflags -Wl,--as-needed --as-needed
+	#missing libs for UI/cli,UI/cli/ncurses,daemon/auth
+	local morelibs=""
+	morelibs="-lboost_thread \
+		-lboost_date_time"
 
-	econf \
+	econf LIBS="${morelibs}" \
 		$(use_enable debug) \
 		$(use_enable gtk gui) \
 		$(use_enable ncurses cli) \
@@ -50,17 +53,18 @@
 		$(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-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
 
@@ -77,5 +81,8 @@
 	echo
 	elog "BTG needs a daemon.ini and client.ini, to create them run btg-config"
 	elog "and put them in the home of the user running btg (/home/p2p/.btg by default)"
+	ewarn "On hardened systems you must run"
+	ewarn "paxctl -m /usr/bin/btgdaemon /usr/bin/btgcli /usr/bin/btgncli"
+	ewarn "to get btg work."
 	echo
 }