--- nzbget-0.7.0.ebuild
+++ nzbget-0.8.0_pre394.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.7.0.ebuild,v 1.5 2010/09/11 18:59:05 armin76 Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils
 
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="debug ssl gnutls ncurses parcheck"
 
 DEPEND="dev-libs/libxml2
@@ -29,6 +29,8 @@
 	)"
 RDEPEND="${DEPEND}"
 
+DOCS=( AUTHORS ChangeLog README nzbget.conf.example )
+
 S="${WORKDIR}"/${P/_pre*/-testing}
 
 src_prepare() {
@@ -45,7 +47,7 @@
 		"${S}"/nzbget.conf.example >"${S}"/nzbgetd.conf.example \
 		|| die "sed nzbgetd.conf.example failed"
 
-	epatch "${FILESDIR}"/${P}-openssl-1.patch
+	epatch "${FILESDIR}"/${PN}-0.7.0-openssl-1.patch
 }
 
 src_configure() {
@@ -54,16 +56,15 @@
 		$(use_enable ncurses curses) \
 		$(use_enable parcheck) \
 		$(use_enable ssl tls) \
-		--with-tlslib=$(use gnutls && echo GnuTLS || echo OpenSSL) \
-	|| die "econf failed"
+		--with-tlslib=$(use gnutls && echo GnuTLS || echo OpenSSL)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	default
 
 	insinto /etc
-	newins nzbget.conf.example nzbget.conf || die "newins failed"
-	newins nzbgetd.conf.example nzbgetd.conf || die "newins failed"
+	newins nzbget.conf.example nzbget.conf
+	newins nzbgetd.conf.example nzbgetd.conf
 
 	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
 	keepdir /var/{log,run}/nzbget
@@ -76,8 +77,6 @@
 
 	insinto /usr/share/nzbget
 	doins postprocess-example.conf
-
-	dodoc AUTHORS ChangeLog README nzbget.conf.example || die "dodoc failed"
 }
 
 pkg_preinst() {