--- /home/flame/devel/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild	2005-03-03 00:28:48.000000000 +0100
+++ proftpd-1.2.10-r3.ebuild	2005-05-19 11:05:46.555596968 +0200
@@ -4,9 +4,8 @@
 
 inherit flag-o-matic eutils
 
-#Mod shaper is giving problems on some machines
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux sendfile"
-#IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
+IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd 
+	selinux sendfile authunix authfile ncurses xinetd"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -20,12 +19,14 @@
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
 
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
+DEPEND="pam? ( virtual/pam )
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( >=dev-db/postgresql-7.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+	ncurses? ( sys-libs/ncurses )
+	xinetd? ( sys-apps/xinetd )"
 
 RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
 
@@ -75,10 +76,6 @@
 		myconf="${myconf} --with-includes=/usr/include/postgresql"
 	fi
 
-	if use sendfile; then
-		myconf="${myconf} --with-sendfile"
-	fi
-
 	if use softquota; then
 		modules="${modules}:mod_quotatab"
 		if use mysql || use postgres; then
@@ -112,7 +109,12 @@
 		--enable-autoshadow \
 		--enable-ctrls \
 		--with-modules=${modules} \
-		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
+		$(use_enable authunix auth-unix) \
+		$(use_enable authfile auth-file) \
+		$(use_enable ncurses) \
+		$(use_enable ipv6) \
+		$(use_with sendfile) \
+		${myconf} || die "bad ./configure"
 
 	emake || die "compile problem"
 }
@@ -139,21 +141,19 @@
 	insinto /etc/proftpd
 	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
 
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/ftp.pamd ftp
-	fi
+	newpamd ${FILESDIR}/ftp.pamd-include ftp
 
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins ${FILESDIR}/proftpd.xinetd proftpd
+	fi
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
+	newinitd ${FILESDIR}/proftpd.rc6 proftpd
 }
 
 pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
+	enewgroup proftpd
+	enewuser proftpd -1 /bin/false /home/ftp proftpd
 	einfo
 	einfo 'You can find the config files in /etc/proftpd'
 	einfo