Added selinux to IUSE and removed old ebuild versions

11 files changed, 23 insertions, 573 deletions

diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 5e3102a70b84..7488f24d7910 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-proxy/squid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.12 2004/09/27 03:55:32 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.13 2004/10/11 23:07:15 cyfred Exp $
+
+  12 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.4.7.ebuild,
+  -squid-2.5.5-r2.ebuild, squid-2.5.5-r3.ebuild, -squid-2.5.6-r1.ebuild,
+  squid-2.5.6-r2.ebuild, -squid-2.5.6.ebuild:
+  added selinux to IUSE
 
   26 Sep 2004; Tom Gall <tgall@gentoo.org> squid-2.5.6-r2.ebuild:
   stable on ppc64, bug #61280
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index c2a0e2863e88..79043dbb5426 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,24 +1,18 @@
-MD5 9aaf3e047dd4ab8deb1ffd072ad3c9e1 ChangeLog 10385
+MD5 81a38c1c8b9bde45861c616a3d06621a squid-2.5.5-r3.ebuild 5383
+MD5 30ae77f62cc477f3e340346ba5040170 squid-2.5.6-r2.ebuild 5767
+MD5 e4a8135ed447b72a7271fade6c06e9cc squid-2.4.7.ebuild 4000
+MD5 f31cfd516560284abf5a9c5d71b4d864 ChangeLog 10600
 MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
-MD5 8777132b9dc53e9462ed51f291e9f75e squid-2.4.7.ebuild 3992
-MD5 f98ac2e961a1eaaa8437083b278a03d4 squid-2.5.5-r2.ebuild 5804
-MD5 650398264a3620304dec77a7dd0c9bc8 squid-2.5.5-r3.ebuild 5375
-MD5 dcc877515903d35744496ae08e917271 squid-2.5.6-r1.ebuild 5736
-MD5 80325ebf58558381181977de5a4bd471 squid-2.5.6-r2.ebuild 5758
-MD5 0898263c22da650eb9bab5da0f709626 squid-2.5.6.ebuild 5330
-MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
-MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71
-MD5 45bf3c4b37515fe4da4ed6d39904132d files/digest-squid-2.5.5-r3 147
-MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
-MD5 3794efc63eff1b0c9140d2396ca83e4d files/digest-squid-2.5.6-r1 147
-MD5 3f83edef485d5ba24d3819daee026aeb files/digest-squid-2.5.6-r2 156
-MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
-MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
 MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
-MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
-MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
+MD5 45bf3c4b37515fe4da4ed6d39904132d files/digest-squid-2.5.5-r3 147
+MD5 3f83edef485d5ba24d3819daee026aeb files/digest-squid-2.5.6-r2 156
 MD5 6e37fe3047234060fc63d5c16a4b7853 files/squid.confd 437
 MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41
+MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
+MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
+MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
 MD5 bea1d2ef8cb2f1590f89bf37f28b9268 files/squid.pam 505
 MD5 1b391c390c547ef3a249aee590e654d8 files/squid.rc6 1980
+MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
+MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
diff --git a/www-proxy/squid/files/digest-squid-2.5.5-r2 b/www-proxy/squid/files/digest-squid-2.5.5-r2
deleted file mode 100644
index 14cc1f4b2777..000000000000
--- a/www-proxy/squid/files/digest-squid-2.5.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2 1044932
diff --git a/www-proxy/squid/files/digest-squid-2.5.6 b/www-proxy/squid/files/digest-squid-2.5.6
deleted file mode 100644
index c8bb1af72488..000000000000
--- a/www-proxy/squid/files/digest-squid-2.5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 1047199
diff --git a/www-proxy/squid/files/digest-squid-2.5.6-r1 b/www-proxy/squid/files/digest-squid-2.5.6-r1
deleted file mode 100644
index 6f15da3a8dc8..000000000000
--- a/www-proxy/squid/files/digest-squid-2.5.6-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 1047199
-MD5 08edb11870c5d84bb9c771b56b6f412d squid-2.5.STABLE6-patches.tar.gz 16268
diff --git a/www-proxy/squid/squid-2.4.7.ebuild b/www-proxy/squid/squid-2.4.7.ebuild
index 068bcdad2dbf..8c0b55abb854 100644
--- a/www-proxy/squid/squid-2.4.7.ebuild
+++ b/www-proxy/squid/squid-2.4.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.4.7.ebuild,v 1.2 2004/08/16 01:29:20 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.4.7.ebuild,v 1.3 2004/10/11 23:07:15 cyfred Exp $
 
 inherit eutils
 
-IUSE="snmp pam ldap debug"
+IUSE="snmp pam ldap debug selinux"
 
 # this could be cleaner..
 MY_P=${PN}-2.4.STABLE7
diff --git a/www-proxy/squid/squid-2.5.5-r2.ebuild b/www-proxy/squid/squid-2.5.5-r2.ebuild
deleted file mode 100644
index 63cb95559504..000000000000
--- a/www-proxy/squid/squid-2.5.5-r2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.5-r2.ebuild,v 1.1 2004/08/15 19:01:21 stuart Exp $
-
-inherit eutils
-
-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 amd64 ppc64"
-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
-
-	# Fix vunerability in ntml as listed on bug #53367
-	epatch ${FILESDIR}/squid-${PV}-ntml-auth-fix.patch || 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"
-
-	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
-
-	./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
-
-	#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 -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
-
-	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/www-proxy/squid/squid-2.5.5-r3.ebuild b/www-proxy/squid/squid-2.5.5-r3.ebuild
index faa84de01fd8..8d60e6799580 100644
--- a/www-proxy/squid/squid-2.5.5-r3.ebuild
+++ b/www-proxy/squid/squid-2.5.5-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.5-r3.ebuild,v 1.2 2004/08/16 11:30:58 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.5-r3.ebuild,v 1.3 2004/10/11 23:07:15 cyfred Exp $
 
 inherit eutils
 
-IUSE="pam ldap ssl sasl snmp debug"
+IUSE="pam ldap ssl sasl snmp debug selinux"
 
 #lame archive versioning scheme..
 S_PV=${PV%.*}
diff --git a/www-proxy/squid/squid-2.5.6-r1.ebuild b/www-proxy/squid/squid-2.5.6-r1.ebuild
deleted file mode 100644
index 92059a2691e4..000000000000
--- a/www-proxy/squid/squid-2.5.6-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6-r1.ebuild,v 1.3 2004/08/22 18:26:35 cyfred Exp $
-
-inherit eutils
-
-IUSE="pam ldap ssl sasl snmp debug uclibc"
-
-#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
-	http://dev.gentoo.org/~cyfred/distfiles/squid-2.5.STABLE6-patches.tar.gz"
-
-RDEPEND="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
-	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 )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~alpha ppc"
-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
-
-	# Do bulk patching from squids bug fix list for stable 6 see #57081
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
-
-	#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() {
-	# Support for uclibc #61175
-	if use 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 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
-
-	./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 \
-		--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
-
-	#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 -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
-
-	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/www-proxy/squid/squid-2.5.6-r2.ebuild b/www-proxy/squid/squid-2.5.6-r2.ebuild
index 073ef51fb070..95704f091fb6 100644
--- a/www-proxy/squid/squid-2.5.6-r2.ebuild
+++ b/www-proxy/squid/squid-2.5.6-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6-r2.ebuild,v 1.7 2004/09/27 03:55:32 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6-r2.ebuild,v 1.8 2004/10/11 23:07:15 cyfred Exp $
 
 inherit eutils
 
-IUSE="pam ldap ssl sasl snmp debug uclibc"
+IUSE="pam ldap ssl sasl snmp debug uclibc selinux"
 
 #lame archive versioning scheme..
 S_PV=${PV%.*}
diff --git a/www-proxy/squid/squid-2.5.6.ebuild b/www-proxy/squid/squid-2.5.6.ebuild
deleted file mode 100644
index c04ad334ce7c..000000000000
--- a/www-proxy/squid/squid-2.5.6.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6.ebuild,v 1.3 2004/08/26 15:07:26 jhuebel Exp $
-
-inherit eutils
-
-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.75 )
-	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 )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="~x86 amd64 ~alpha ppc"
-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
-
-	# Fix storeCreate: ufs_no_valid_dir as listed on squid bug #1103
-	epatch ${FILESDIR}/squid-${PV}-ufs-no-valid-dir.patch || 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}"
-	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
-
-	./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
-
-	#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 -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
-
-	echo
-	ewarn "Squid authentication helpers have been installed suid root"
-	ewarn "This allows shadow based authentication, see bug #52977 for more"
-	echo
-}