--- /home/flame/devel/gentoo-x86/net-proxy/squid/squid-2.5.10_rc3.ebuild	2005-05-13 10:40:19.863330200 +0200
+++ squid-2.5.10_rc3.ebuild	2005-05-19 13:42:32.686647696 +0200
@@ -21,10 +21,9 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~mips"
-IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores logrotate customlog zero-penalty-hit"
+IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit"
 
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
+RDEPEND="pam? ( virtual/pam )
 	ldap? ( >=net-nds/openldap-2.1.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6m )
 	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
@@ -51,8 +50,7 @@
 		helpers/basic_auth/*/Makefile.in
 
 	if ! use debug ;	then
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
+		sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
 		export WANT_AUTOCONF=2.1
 		autoconf || die "autoconf failed"
 	fi
@@ -60,7 +58,7 @@
 
 src_compile() {
 	# Support for uclibc #61175
-	if use uclibc; then
+	if use elibc_uclibc; then
 		local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
 	else
 		local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
@@ -87,7 +85,7 @@
 	fi
 
 	# Support for uclibc #61175
-	if use uclibc; then
+	if use elibc_uclibc; then
 		myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' "
 		myconf="${myconf} --disable-async-io "
 	else
@@ -173,12 +171,9 @@
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	insinto /etc/pam.d
-	newins ${FILESDIR}/squid.pam squid
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/squid.rc6 squid
-	insinto /etc/conf.d
-	newins ${FILESDIR}/squid.confd squid
+	newpamd "${FILESDIR}/squid.pam-include" squid
+	newinitd "${FILESDIR}/squid.rc6" squid
+	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		insinto /etc/logrotate.d
 		newins ${FILESDIR}/squid-logrotate squid