5c5,7
< inherit eutils
---
> EAPI="1"
> 
> inherit autotools eutils
9c11
< SRC_URI="mirror://berlios/${PN}/${P}-p1.tar.gz"
---
> SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
14c16
< IUSE="debug doc event-callback gtk minimal ncurses session test upnp webinterface"
---
> IUSE="debug doc event-callback gtk minimal ncurses session test webinterface"
16c18
< RDEPEND="dev-libs/boost
---
> RDEPEND=">=dev-libs/boost-1.34.1
23,26c25,29
< 	net-libs/rb_libtorrent
< 	gtk? ( >=dev-cpp/gtkmm-2.4
< 		x11-libs/pango )
< 	webinterface? ( =dev-lang/php-5* )"
---
> 	>=net-libs/rb_libtorrent-0.13_rc1
> 	gtk? ( dev-cpp/gtkmm:2.4
> 		x11-libs/pango
> 		dev-libs/libsigc++:2 )
> 	webinterface? ( =dev-lang/php-5* virtual/httpd-cgi )"
31,40c34,41
< S="${WORKDIR}/${PN}-${PV/_rc*}"
< 
< pkg_setup() {
< 	if ! built_with_use --missing true "dev-libs/boost" threads && \
< 		! built_with_use --missing true "dev-libs/boost" threadsonly ; then
< 			echo
< 			elog "Compile dev-libs/boost with USE=threads or USE=threadsonly"
< 			elog "if you want threading support for btg"
< 			echo
< 	fi
---
> src_unpack() {
> 	unpack ${A}
> 	cd "${S}"
> 
> 	epatch \
> 		"${FILESDIR}/${P}-as_needed.patch" \
> 		"${FILESDIR}/${P}-broken_bundled_plotmm_sigc.patch"
> 	AT_M4DIR="m4" eautoreconf
44,54d44
< 	local myconf=""
< 
< 	if built_with_use --missing true "dev-libs/boost" threads || \
< 		built_with_use --missing true "dev-libs/boost" threadsonly ; then
< 			myconf="--with-boost-iostreams=boost_iostreams-mt \
< 				--with-boost-filesystem=boost_filesystem-mt \
< 				--with-boost-thread=boost_thread-mt \
< 				--with-boost-date-time=boost_date_time-mt \
< 				--with-boost-program_options=boost_program_options-mt"
< 	fi
< 
59d48
< 		$(use_enable upnp) \
65c54
< 		${myconf} \
---
> 		--disable-upnp \
67c56
< 		|| die
---
> 		|| die "econf failed"
69c58
< 	emake || die
---
> 	emake || die "emake failed"
73c62
< 	emake DESTDIR="${D}" install || die
---
> 	emake DESTDIR="${D}" install || die "emake install failed"