--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -1,1 +1,1 @@ 
-# Copyright 1999-2009 Gentoo Foundation
---
+# Copyright 1999-2010 Gentoo Foundation
@@ -10,1 +10,1 @@ 
-DEFLATE_VER="0.4"
---
+DEFLATE_VER="0.5"
@@ -78,3 +78,0 @@ 
-	# Fix segfault on conf check, Gentoo bug #297310
-	epatch "${FILESDIR}"/${P}-tls-shmcache-bug3359.patch
-
@@ -170,2 +167,2 @@ 
-	LIBS="${myl}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow \
---
+	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
+		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
@@ -180,2 +177,1 @@ 
-		$(use_enable pam auth-pam) \
-		${myc:1} || die "econf failed"
---
+		$(use_enable pam auth-pam)
@@ -185,1 +181,1 @@ 
-	emake DESTDIR="${D}" install || die "emake install failed"
---
+	emake DESTDIR="${D}" install
@@ -187,0 +183,2 @@ 
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
@@ -188,1 +186,1 @@ 
-	newinitd "${FILESDIR}"/proftpd.rc7 proftpd
---
+	newinitd "${FILESDIR}"/proftpd.initd proftpd
@@ -193,2 +191,0 @@ 
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample