Removing old versions of 2.5. Marking -r2 amd64 stable. Closing bug #52977

11 files changed, 15 insertions, 680 deletions

diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index 9605f50639fa..4524c190bbee 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/squid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.55 2004/07/15 05:04:40 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.56 2004/07/15 05:28:29 cyfred Exp $
+
+  15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -squid-2.5.3.ebuild,
+  -squid-2.5.4.ebuild, -squid-2.5.5-r1.ebuild, squid-2.5.5-r2.ebuild,
+  -squid-2.5.5.ebuild:
+  Removing old versions of 2.5. Marking -r2 amd64 stable. Closing bug #52977
 
 *squid-2.5.6 (15 Jul 2004)
 
diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest
index 003354bdc96b..9a51d560cbbb 100644
--- a/net-www/squid/Manifest
+++ b/net-www/squid/Manifest
@@ -1,15 +1,10 @@
-MD5 f116f427f152b040e79718dc61ad3a00 squid-2.5.4.ebuild 5251
 MD5 5e29b1110f2fc6f0c5abcc71d44a3659 squid-2.5.6.ebuild 5780
-MD5 d706adb32d3eba692102018a4cd8f2ff squid-2.5.5-r2.ebuild 5647
-MD5 35ac3fff52dc7f3fd0e81c383b67e800 squid-2.5.3.ebuild 4938
+MD5 41bc7300e98a2f780eaed3e49744f22a squid-2.5.5-r2.ebuild 5797
 MD5 29685f0894c8370b80ed6ae4908d1133 squid-2.4.7.ebuild 3539
-MD5 7681c8c7d3958abd41a9009c1e9cf1db squid-2.5.5.ebuild 4981
-MD5 c033aedbe3729181b213ee604a167cb8 squid-2.5.5-r1.ebuild 5237
-MD5 6b4cc16dcd62309bbef449a3d07ae0bc ChangeLog 8022
+MD5 1bc3e3cd517e34027f27111b8967e824 ChangeLog 8264
 MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
 MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
-MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r1 71
 MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71
 MD5 3351a9887b4bb7b8a9d8be6a6c79c53c files/squid.confd 437
 MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41
@@ -20,7 +15,4 @@ MD5 da04bda1eac0b7993089be8b592a8650 files/squid.pam 505
 MD5 a94acb581ad7e59d2451fcd0c68cc6ac files/squid.rc6 1981
 MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
 MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
-MD5 6658bb10c03cd2940380d3358c2d8eef files/digest-squid-2.5.3 71
-MD5 7183dd9775e11802755e8dc6be14e083 files/digest-squid-2.5.4 146
-MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5 71
 MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
diff --git a/net-www/squid/files/digest-squid-2.5.3 b/net-www/squid/files/digest-squid-2.5.3
deleted file mode 100644
index 796e250584e8..000000000000
--- a/net-www/squid/files/digest-squid-2.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed5eb7835d00fdecc7dd7c1837542df2 squid-2.5.STABLE3.tar.bz2 1028081
diff --git a/net-www/squid/files/digest-squid-2.5.4 b/net-www/squid/files/digest-squid-2.5.4
deleted file mode 100644
index 84ca9274d0c1..000000000000
--- a/net-www/squid/files/digest-squid-2.5.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ed5eb7835d00fdecc7dd7c1837542df2 squid-2.5.STABLE3.tar.bz2 1028081
-MD5 7f4e341a3f5f56837634046dd35e01dd diff-2.5.STABLE3-2.5.STABLE4.gz 43063
diff --git a/net-www/squid/files/digest-squid-2.5.5 b/net-www/squid/files/digest-squid-2.5.5
deleted file mode 100644
index 14cc1f4b2777..000000000000
--- a/net-www/squid/files/digest-squid-2.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2 1044932
diff --git a/net-www/squid/files/digest-squid-2.5.5-r1 b/net-www/squid/files/digest-squid-2.5.5-r1
deleted file mode 100644
index 14cc1f4b2777..000000000000
--- a/net-www/squid/files/digest-squid-2.5.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2 1044932
diff --git a/net-www/squid/squid-2.5.3.ebuild b/net-www/squid/squid-2.5.3.ebuild
deleted file mode 100644
index c33b2a7e0371..000000000000
--- a/net-www/squid/squid-2.5.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.3.ebuild,v 1.13 2004/07/01 22:50:23 eradicator Exp $
-
-IUSE="pam ldap ssl sasl snmp debug"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.72 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	selinux? ( sec-policy/selinux-squid )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha hppa"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if ! use debug
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	if use sasl; then
-		basic_modules="SASL,${basic_modules}"
-		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			cd ${S}/helpers/basic_auth/SASL/
-			cp sasl_auth.c sasl_auth.c.orig
-			sed \
-				-e "s:sasl.h:sasl/sasl.h:" \
-				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
-				-e "s:strlen(password), \&errstr:strlen(password):" \
-				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
-			cd ${S}
-		fi
-	fi
-
-	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"
-
-	./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-storeio="ufs,diskd,coss,aufs,null" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--disable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mv include/autoconf.h include/autoconf.h.orig
-		sed -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
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
-
-	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
-	exeinto /etc/cron.weekly ; doexe ${FILESDIR}/squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.4.ebuild b/net-www/squid/squid-2.5.4.ebuild
deleted file mode 100644
index 1205f3ad8fad..000000000000
--- a/net-www/squid/squid-2.5.4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.4.ebuild,v 1.14 2004/07/01 22:50:23 eradicator Exp $
-
-IUSE="pam ldap ssl sasl snmp debug"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-#S=${WORKDIR}/${S_PP}
-S=${WORKDIR}/squid-2.5.STABLE3
-#SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/squid-2.5.STABLE3.tar.bz2
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/diff-2.5.STABLE3-2.5.STABLE4.gz"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.72 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	selinux? ( sec-policy/selinux-squid )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc alpha hppa ia64"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	#patch up to 2.5.STABLE4
-	patch -p1 <../diff-2.5.STABLE3-2.5.STABLE4 || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if ! use debug
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		export WANT_AUTOCONF=2.1
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	if use sasl; then
-		basic_modules="SASL,${basic_modules}"
-		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			cd ${S}/helpers/basic_auth/SASL/
-			cp sasl_auth.c sasl_auth.c.orig
-			sed \
-				-e "s:sasl.h:sasl/sasl.h:" \
-				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
-				-e "s:strlen(password), \&errstr:strlen(password):" \
-				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
-			cd ${S}
-		fi
-	fi
-
-	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"
-
-	./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-storeio="ufs,diskd,coss,aufs,null" \
-		--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-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-#	if [ "${ARCH}" = "hppa" ]
-#	then
-#		mv include/autoconf.h include/autoconf.h.orig
-#		sed -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
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
-
-	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
-	exeinto /etc/cron.weekly ; doexe ${FILESDIR}/squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.5-r1.ebuild b/net-www/squid/squid-2.5.5-r1.ebuild
deleted file mode 100644
index 3c3d8c504e6a..000000000000
--- a/net-www/squid/squid-2.5.5-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.5-r1.ebuild,v 1.6 2004/07/01 22:50:23 eradicator Exp $
-
-IUSE="pam ldap ssl sasl snmp debug"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.72 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	selinux? ( sec-policy/selinux-squid )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 s390"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if ! use debug
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		export WANT_AUTOCONF=2.1
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	if use sasl; then
-		basic_modules="SASL,${basic_modules}"
-		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			cd ${S}/helpers/basic_auth/SASL/
-			cp sasl_auth.c sasl_auth.c.orig
-			sed \
-				-e "s:sasl.h:sasl/sasl.h:" \
-				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
-				-e "s:strlen(password), \&errstr:strlen(password):" \
-				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
-			cd ${S}
-		fi
-	fi
-
-	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"
-
-	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
-
-	./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-storeio="ufs,diskd,coss,aufs,null" \
-		--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-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-#	if [ "${ARCH}" = "hppa" ]
-#	then
-#		mv include/autoconf.h include/autoconf.h.orig
-#		sed -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
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
-
-	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
-	exeinto /etc/cron.weekly ; newexe ${FILESDIR}/squid-r1.cron squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.5-r2.ebuild b/net-www/squid/squid-2.5.5-r2.ebuild
index ce199af51aff..b6d3d5db8c39 100644
--- a/net-www/squid/squid-2.5.5-r2.ebuild
+++ b/net-www/squid/squid-2.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.5-r2.ebuild,v 1.11 2004/07/01 22:50:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.5-r2.ebuild,v 1.12 2004/07/15 05:28:29 cyfred Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ RDEPEND="virtual/libc
 	selinux? ( sec-policy/selinux-squid )"
 DEPEND="${RDEPEND} dev-lang/perl"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ~ia64 s390 ~amd64"
+KEYWORDS="x86 ppc sparc alpha hppa ~ia64 s390 amd64"
 SLOT="0"
 
 src_unpack() {
@@ -179,4 +179,9 @@ pkg_postinst() {
 	# empty dirs..
 	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
 	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
+
+	echo
+	ewarn "Squid authentication helpers have been installed suid root"
+	ewarn "This allows shadow based authentication, see bug #52977 for more"
+	echo
 }
diff --git a/net-www/squid/squid-2.5.5.ebuild b/net-www/squid/squid-2.5.5.ebuild
deleted file mode 100644
index 087d0bcea7ea..000000000000
--- a/net-www/squid/squid-2.5.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.5.ebuild,v 1.10 2004/07/01 22:50:23 eradicator Exp $
-
-IUSE="pam ldap ssl sasl snmp debug"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.72 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	selinux? ( sec-policy/selinux-squid )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ia64"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if ! use debug
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		export WANT_AUTOCONF=2.1
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	if use sasl; then
-		basic_modules="SASL,${basic_modules}"
-		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			cd ${S}/helpers/basic_auth/SASL/
-			cp sasl_auth.c sasl_auth.c.orig
-			sed \
-				-e "s:sasl.h:sasl/sasl.h:" \
-				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
-				-e "s:strlen(password), \&errstr:strlen(password):" \
-				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
-			cd ${S}
-		fi
-	fi
-
-	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"
-
-	./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-storeio="ufs,diskd,coss,aufs,null" \
-		--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-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-#	if [ "${ARCH}" = "hppa" ]
-#	then
-#		mv include/autoconf.h include/autoconf.h.orig
-#		sed -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
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
-
-	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
-	exeinto /etc/cron.weekly ; doexe ${FILESDIR}/squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}