remove old versions

(Portage version: 2.0.53)

9 files changed, 22 insertions, 442 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index bddd0cc0e0db..49207f32a808 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.58 2006/01/08 13:59:05 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.59 2006/01/09 06:03:12 mrness Exp $
+
+  09 Jan 2006; Alin Nastac <mrness@gentoo.org> files/squid.pam,
+  -files/squid.pam-include, -squid-2.5.10-r2.ebuild,
+  -squid-2.5.10-r4.ebuild, squid-2.5.11.ebuild, squid-2.5.12.ebuild:
+  Remove old versions.
 
   08 Jan 2006; Stuart Longland <redhatter@gentoo.org> squid-2.5.12.ebuild:
   Marked 2.5.12 stable on MIPS, and fixed the copyright header to keep repoman
diff --git a/net-proxy/squid/files/digest-squid-2.5.10-r2 b/net-proxy/squid/files/digest-squid-2.5.10-r2
deleted file mode 100644
index e66e88195e73..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.10-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b74d7a0be462e9e3435ab771316385af squid-2.5.STABLE10.tar.gz 1383522
-MD5 5ee5f93c97d29c85ae1c85d888f3c352 squid-2.5.STABLE10-patches-20050902.tar.gz 53018
diff --git a/net-proxy/squid/files/digest-squid-2.5.10-r4 b/net-proxy/squid/files/digest-squid-2.5.10-r4
deleted file mode 100644
index 2750a5ef1272..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.10-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b74d7a0be462e9e3435ab771316385af squid-2.5.STABLE10.tar.gz 1383522
-MD5 dfa977e1a7f8d2b920b15b5f9fb50c6d squid-2.5.STABLE10-patches-20050916.tar.gz 61047
diff --git a/net-proxy/squid/files/squid.pam b/net-proxy/squid/files/squid.pam
index 3f634a3cfae0..7589298fae75 100644
--- a/net-proxy/squid/files/squid.pam
+++ b/net-proxy/squid/files/squid.pam
@@ -1,8 +1,8 @@
 #%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.1 2005/04/22 19:15:11 mrness Exp $
-auth       required     /lib/security/pam_stack.so service=system-auth
-auth       required     /lib/security/pam_nologin.so
-account    required     /lib/security/pam_stack.so service=system-auth
-password   required     /lib/security/pam_stack.so service=system-auth
-session    required     /lib/security/pam_stack.so service=system-auth
-session    required     /lib/security/pam_limits.so
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.2 2006/01/09 06:03:12 mrness Exp $
+auth       include		system-auth
+auth       required		pam_nologin.so
+account    include		system-auth
+password   include		system-auth
+session    include		system-auth
+session    optional		pam_limits.so
diff --git a/net-proxy/squid/files/squid.pam-include b/net-proxy/squid/files/squid.pam-include
deleted file mode 100644
index cdf27040f2ba..000000000000
--- a/net-proxy/squid/files/squid.pam-include
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam-include,v 1.1 2005/05/19 19:27:53 mrness Exp $
-auth       include		system-auth
-auth       required     pam_nologin.so
-account    include		system-auth
-password   include		system-auth
-session    include		system-auth
-session    optional		pam_limits.so
diff --git a/net-proxy/squid/squid-2.5.10-r2.ebuild b/net-proxy/squid/squid-2.5.10-r2.ebuild
deleted file mode 100644
index bfc46830f298..000000000000
--- a/net-proxy/squid/squid-2.5.10-r2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.10-r2.ebuild,v 1.10 2005/10/04 21:19:45 mrness Exp $
-
-inherit eutils pam toolchain-funcs
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PL=${S_PL/_rc/-RC}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-PATCH_VERSION="20050902"
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
-
-S=${WORKDIR}/${S_PP}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff"
-
-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 )
-	selinux? ( sec-policy/selinux-squid )
-	!mips? ( logrotate? ( app-admin/logrotate ) )"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "dir ${S} not found"
-
-	# Do bulk patching from squids bug fix list as well as our patches
-	use customlog || rm ${WORKDIR}/patch/9*customlog*
-	use zero-penalty-hit || rm ${WORKDIR}/patch/9*ToS_Hit*
-	use follow-xff || rm ${WORKDIR}/patch/9*follow_xff*
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/patch
-
-	#hmm #10865
-	sed -i -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		helpers/external_acl/ldap_group/Makefile.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e 's:_LDFLAGS[ ]*=:_LDFLAGS = -Wl,-z,now:' \
-		helpers/basic_auth/*/Makefile.in
-
-	if ! use debug ; then
-		sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-		export WANT_AUTOCONF=2.1
-		autoconf || die "autoconf failed"
-	fi
-}
-
-src_compile() {
-	# Support for uclibc #61175
-	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"
-	fi
-
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	# SASL 1 / 2 Supported Natively
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
-	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
-
-	use amd64 && myconf="${myconf} --disable-internal-dns "
-
-	if use underscores; then
-		ewarn "Enabling underscores in domain names will result in dns resolution"
-		ewarn "failure if your local DNS client (probably bind) is not compatible."
-		myconf="${myconf} --enable-underscores"
-	fi
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' "
-		myconf="${myconf} --disable-async-io "
-	else
-		myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' "
-		myconf="${myconf} --enable-async-io "
-	fi
-
-	export CC=$(tc-getCC)
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-#	if [ "${ARCH}" = "hppa" ]
-#	then
-#		sed -i -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \
-#			include/autoconf.h.orig > include/autoconf.h
-#	fi
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	#--enable-icmp
-	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
-	#chown root:squid ${D}/usr/lib/squid/pinger
-	#chmod 4750 ${D}/usr/lib/squid/pinger
-
-	#need suid root for looking into /etc/shadow
-	chown root:squid ${D}/usr/lib/squid/ncsa_auth
-	chown root:squid ${D}/usr/lib/squid/pam_auth
-	chmod 4750 ${D}/usr/lib/squid/ncsa_auth
-	chmod 4750 ${D}/usr/lib/squid/pam_auth
-
-	#some clean ups
-	rm -f ${D}/usr/bin/Run*
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam-include" squid
-	newinitd "${FILESDIR}/squid.initd" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/squid-logrotate squid
-	else
-		exeinto /etc/cron.weekly
-		newexe ${FILESDIR}/squid.cron squid.cron
-	fi
-
-	rm -rf ${D}/var
-	diropts -m0755 -o squid -g squid
-	dodir /var/cache/squid /var/log/squid
-}
-
-pkg_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root"
-	ewarn "This allows shadow based authentication, see bug #52977 for more"
-	echo
-	einfo "For winbind authentication to work with squid you should change the"
-	einfo "/var/cache/samba/winbindd_privileged group to the same one you use"
-	einfo "in the cache_effective_group option on your squid.conf:"
-	einfo "    chgrp squid /var/cache/samba/winbindd_privileged"
-	echo
-}
diff --git a/net-proxy/squid/squid-2.5.10-r4.ebuild b/net-proxy/squid/squid-2.5.10-r4.ebuild
deleted file mode 100644
index 63a0462bd548..000000000000
--- a/net-proxy/squid/squid-2.5.10-r4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.10-r4.ebuild,v 1.8 2005/10/04 21:19:45 mrness Exp $
-
-inherit eutils pam toolchain-funcs
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PL=${S_PL/_rc/-RC}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-PATCH_VERSION="20050916"
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
-
-S=${WORKDIR}/${S_PP}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff"
-
-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 )
-	selinux? ( sec-policy/selinux-squid )
-	!mips? ( logrotate? ( app-admin/logrotate ) )"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "dir ${S} not found"
-
-	# Do bulk patching from squids bug fix list as well as our patches
-	use customlog || rm ${WORKDIR}/patch/9*customlog*
-	use zero-penalty-hit || rm ${WORKDIR}/patch/9*ToS_Hit*
-	use follow-xff || rm ${WORKDIR}/patch/9*follow_xff*
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/patch
-
-	#hmm #10865
-	sed -i -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		helpers/external_acl/ldap_group/Makefile.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e 's:_LDFLAGS[ ]*=:_LDFLAGS = -Wl,-z,now:' \
-		helpers/basic_auth/*/Makefile.in
-
-	if ! use debug ; then
-		sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-	fi
-	export WANT_AUTOCONF=2.1
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	# Support for uclibc #61175
-	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"
-	fi
-
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	# SASL 1 / 2 Supported Natively
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
-	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
-
-	use amd64 && myconf="${myconf} --disable-internal-dns "
-
-	if use underscores; then
-		ewarn "Enabling underscores in domain names will result in dns resolution"
-		ewarn "failure if your local DNS client (probably bind) is not compatible."
-		myconf="${myconf} --enable-underscores"
-	fi
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null' "
-		myconf="${myconf} --disable-async-io "
-	else
-		myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' "
-		myconf="${myconf} --enable-async-io "
-	fi
-
-	export CC=$(tc-getCC)
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		`use_enable follow-xff follow-x-forwarded-for` \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-#	if [ "${ARCH}" = "hppa" ]
-#	then
-#		sed -i -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \
-#			include/autoconf.h.orig > include/autoconf.h
-#	fi
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	#--enable-icmp
-	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
-	#chown root:squid ${D}/usr/lib/squid/pinger
-	#chmod 4750 ${D}/usr/lib/squid/pinger
-
-	#need suid root for looking into /etc/shadow
-	chown root:squid ${D}/usr/lib/squid/ncsa_auth
-	chown root:squid ${D}/usr/lib/squid/pam_auth
-	chmod 4750 ${D}/usr/lib/squid/ncsa_auth
-	chmod 4750 ${D}/usr/lib/squid/pam_auth
-
-	#some clean ups
-	rm -f ${D}/usr/bin/Run*
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam-include" squid
-	newinitd "${FILESDIR}/squid.initd" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/squid-logrotate squid
-	else
-		exeinto /etc/cron.weekly
-		newexe ${FILESDIR}/squid.cron squid.cron
-	fi
-
-	rm -rf ${D}/var
-	diropts -m0755 -o squid -g squid
-	dodir /var/cache/squid /var/log/squid
-}
-
-pkg_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root"
-	ewarn "This allows shadow based authentication, see bug #52977 for more"
-	echo
-	einfo "For winbind authentication to work with squid you should change the"
-	einfo "/var/cache/samba/winbindd_privileged group to the same one you use"
-	einfo "in the cache_effective_group option on your squid.conf:"
-	einfo "    chgrp squid /var/cache/samba/winbindd_privileged"
-	echo
-}
diff --git a/net-proxy/squid/squid-2.5.11.ebuild b/net-proxy/squid/squid-2.5.11.ebuild
index 563685f9b86e..d725d4790a09 100644
--- a/net-proxy/squid/squid-2.5.11.ebuild
+++ b/net-proxy/squid/squid-2.5.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.11.ebuild,v 1.7 2005/11/23 01:28:57 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.11.ebuild,v 1.8 2006/01/09 06:03:12 mrness Exp $
 
 inherit eutils pam toolchain-funcs
 
@@ -171,15 +171,15 @@ src_install() {
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	newpamd "${FILESDIR}/squid.pam-include" squid
+	newpamd "${FILESDIR}/squid.pam" squid
 	newinitd "${FILESDIR}/squid.initd" squid
 	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		insinto /etc/logrotate.d
-		newins ${FILESDIR}/squid-logrotate squid
+		newins "${FILESDIR}/squid-logrotate" squid
 	else
 		exeinto /etc/cron.weekly
-		newexe ${FILESDIR}/squid.cron squid.cron
+		newexe "${FILESDIR}/squid.cron" squid.cron
 	fi
 
 	rm -rf ${D}/var
diff --git a/net-proxy/squid/squid-2.5.12.ebuild b/net-proxy/squid/squid-2.5.12.ebuild
index 1849c3fd442a..431d3337b8d6 100644
--- a/net-proxy/squid/squid-2.5.12.ebuild
+++ b/net-proxy/squid/squid-2.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.12.ebuild,v 1.7 2006/01/08 13:59:05 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.12.ebuild,v 1.8 2006/01/09 06:03:12 mrness Exp $
 
 inherit eutils pam toolchain-funcs flag-o-matic
 
@@ -171,15 +171,15 @@ src_install() {
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	newpamd "${FILESDIR}/squid.pam-include" squid
+	newpamd "${FILESDIR}/squid.pam" squid
 	newinitd "${FILESDIR}/squid.initd" squid
 	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		insinto /etc/logrotate.d
-		newins ${FILESDIR}/squid-logrotate squid
+		newins "${FILESDIR}/squid-logrotate" squid
 	else
 		exeinto /etc/cron.weekly
-		newexe ${FILESDIR}/squid.cron squid.cron
+		newexe "${FILESDIR}/squid.cron" squid.cron
 	fi
 
 	rm -rf ${D}/var