--- /home/flame/devel/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild	2005-05-05 17:41:23.000000000 +0200
+++ cyrus-sasl-2.1.20-r2.ebuild	2005-05-19 11:35:56.974371480 +0200
@@ -23,7 +23,7 @@
 	ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( >=dev-db/mysql-3.23.51 )
 	postgres? ( >=dev-db/postgresql-7.2 )
-	pam? ( >=sys-libs/pam-0.75 )
+	pam? ( virtual/pam )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	kerberos? ( virtual/krb5 )
 	authdaemond? (
@@ -82,20 +82,12 @@
 	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
 		-i saslauthd/auth_rimap.c || die "sed failed"
 
-	# DB4 detection and versioned symbols.
-	# Fixed upstream.
-	# epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch"
-
 	# Add configdir support.
 	epatch "${FILESDIR}/${P}-configdir.patch"
 
 	# Fix include path for newer PostgreSQL versions.
 	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
 
-	# Add setuid/setgid check for SASL_PATH
-	# Fixed upstream.
-	# epatch "${FILESDIR}/${P}-sasl-path-fix.patch"
-
 	# Fix for gcc-4.0
 	epatch "${FILESDIR}/${P}-gcc4.patch"
 
@@ -254,19 +246,16 @@
 	docinto saslauthd
 	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
 
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/saslauthd.pam" saslauthd
-	fi
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/pwcheck.rc6" pwcheck || \
-		die "failed to \"newexe\" pwdcheck to /etc/init.d"
-	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-		die "failed to \"newexe\" saslauthd to /etc/init.d"
-	insinto /etc/conf.d
-	newins "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
+		die "failed to install pwdcheck to /etc/init.d"
+	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
+		die "failed to install saslauthd to /etc/init.d"
+	
+	newconfd "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
 		die "failed to install /etc/conf/saslauthd."
+
 	exeinto ${ROOT}/usr/sbin
 	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
 		die "failed to install testsaslauthd."