From 080784406e3362796cd40f94bb5814ec6faba654 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alin=20N=C4=83stac?= <mrness@gentoo.org>
Date: Tue, 19 Dec 2006 21:56:26 +0000
Subject: [PATCH] Remove obsolete 2.6.x version. Version bump (#158554).
 Package-Manager: portage-2.1.1-r2

---
 net-proxy/squid/Manifest                 |  37 +++--
 net-proxy/squid/files/digest-squid-2.6.3 |   9 --
 net-proxy/squid/squid-2.6.3.ebuild       | 195 -----------------------
 3 files changed, 23 insertions(+), 218 deletions(-)
 delete mode 100644 net-proxy/squid/files/digest-squid-2.6.3
 delete mode 100644 net-proxy/squid/squid-2.6.3.ebuild

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 362cb8ad413f..cb7ef6a5c443 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
@@ -29,13 +32,12 @@ DIST squid-2.5.STABLE13-patches-20060325.tar.gz 23020 RMD160 504261a17070faea4ca
 DIST squid-2.5.STABLE13.tar.gz 1399833 RMD160 5b66a9ef004f3fcb1225cd0378431f7ee4d005b6 SHA1 af1e1c3d33cf87cacadb7916f41b972a7d6df55a SHA256 e8a5330a5f0e79394612ef57d2bf48658551787062055ffba94eb0bc67355b1a
 DIST squid-2.5.STABLE14-patches-20060619.tar.gz 23811 RMD160 a2779367052e0ac2a8ab085c78ad29de41b6f166 SHA1 fccc2097838c9ff3727a5eac1d92e9d8998ea4a9 SHA256 0688f218779317304195aa2f728f6599635d34528882b23eb8461ca4cfa55319
 DIST squid-2.5.STABLE14.tar.gz 1399962 RMD160 abe464ab115b3f9541d3890fd413044f526ab5f0 SHA1 e8cd21bc84e4cab219a00142eb597f6dcefe301b SHA256 3ddb16abfe51f5fcbab66d2ca6a6e25341ed470eb7eb1415111401b9e20ba5f2
-DIST squid-2.6.STABLE3-patches-20060819.tar.gz 4832 RMD160 0bab6b6b9d0df4da9e30a1c2e7e0d9fdd63c8057 SHA1 404362d88d2e949827ed14f8941387859d9203dd SHA256 b096aada8aa92502a05ef96b572f00f6f5127907ba5cfe39d5441a396781cde3
-DIST squid-2.6.STABLE3-patches-20061007.tar.gz 7371 RMD160 f50c838e64501aeff6409840a998a6483791cf42 SHA1 de76db7f5d93b9783a879b7039788cbce58e2c44 SHA256 c156f49d3b6b5c4cb263b20308c3fa219780d01b29a4c5f8ef3bfaa611238830
-DIST squid-2.6.STABLE3.tar.gz 1599876 RMD160 7b13a91f0809b94c1dacc11a9fe9366fd4362395 SHA1 59e52b0be9697108b3a581270cf0695119ffa7df SHA256 293c9b8ea4c5fa19e8df92d86e9554081b66454bd97b0acdf0bbb289845614a6
 DIST squid-2.6.STABLE4-patches-20061016.tar.gz 7261 RMD160 99571e719c8cffa77552967fdb788aa712a6d59f SHA1 95549601405147d4a64905b17f63741c908df314 SHA256 9493ed808920b89d527c26309a0b94a17ea35ac0da2acf65cc91547cf9a151c6
 DIST squid-2.6.STABLE4.tar.gz 1627562 RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 SHA1 82dea18e047c8f1192dde55e51b4537863f44a2c SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0
 DIST squid-2.6.STABLE5-patches-20061108.tar.gz 7328 RMD160 dc9bb2a41a23b17ec2dce6cbc98d1bcd55e2e566 SHA1 f511d33cb1602417a6585a78f4341dcc85dbc902 SHA256 d85c50d0f2716f35b6a230fdb1cea624383a7522b4292f088e6e8bf9588295fb
 DIST squid-2.6.STABLE5.tar.gz 1622608 RMD160 4f3f248678c76b5a289b40cc0279333d40a81ae5 SHA1 9bf5879c166521f519bfe1a1244125a87085ea5f SHA256 e860d12d4147360e03ff6ab5c6b88d6af106332fdd2e85d060d39efbd8a88a36
+DIST squid-2.6.STABLE6-patches-20061219.tar.gz 7164 RMD160 70e6af41dbb512603a70c1f1be68497c43213f1a SHA1 8aae1091584df336d24239afecafb4a519edd365 SHA256 6d4799e2ca21fb8dc5722be36df7064d9d01c0f153b2ecb87f34618991e9e5f1
+DIST squid-2.6.STABLE6.tar.gz 1623289 RMD160 de0d7d22ab7fedb77e8034fe2028610c9303257f SHA1 170cb5f6f603404c245d7b25911da8567859cec4 SHA256 ed02b22dfe0980ccbbe76144fd95c52128319f53e0dd35232bd6a73b6182ab2c
 EBUILD squid-2.5.12-r1.ebuild 6753 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 SHA1 6341414a00f644e58786363965ae3363e2747e3c SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249
 MD5 d016ce3a38feda11279d8b2c1f6dba25 squid-2.5.12-r1.ebuild 6753
 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 squid-2.5.12-r1.ebuild 6753
@@ -52,10 +54,6 @@ EBUILD squid-2.5.14.ebuild 6521 RMD160 40d78192f73c483de1fa06d4434ab61ed8f9a66e
 MD5 0f206eb095d70ec6025a587afb3692c2 squid-2.5.14.ebuild 6521
 RMD160 40d78192f73c483de1fa06d4434ab61ed8f9a66e squid-2.5.14.ebuild 6521
 SHA256 320a9f9fb23e294c1eb406789b95ed98bf34e860234682f0b09222b2f21e5da7 squid-2.5.14.ebuild 6521
-EBUILD squid-2.6.3.ebuild 6315 RMD160 732df4d73f0e4c065915866164906c92f264f6ea SHA1 4dcc5d12b9e796e7b934c638b5569536ed74ead0 SHA256 055275722f83580fc87141f430a58fc01f899747fba4e8a2be671797134de25b
-MD5 cb335bf8d7bf5b7d84a72230fae8b9a2 squid-2.6.3.ebuild 6315
-RMD160 732df4d73f0e4c065915866164906c92f264f6ea squid-2.6.3.ebuild 6315
-SHA256 055275722f83580fc87141f430a58fc01f899747fba4e8a2be671797134de25b squid-2.6.3.ebuild 6315
 EBUILD squid-2.6.4-r2.ebuild 6618 RMD160 88587e7ed89a5247dd23a2e265b4297ca3907dce SHA1 56aea217d7194f89fe2cbcc888df558de0bf57ce SHA256 eda3ab47259e1b12a5200edc102ea890271637ba14d76ecaa11f0e5b0e98d8e3
 MD5 04edc418d8959206339a3f8fe32a37da squid-2.6.4-r2.ebuild 6618
 RMD160 88587e7ed89a5247dd23a2e265b4297ca3907dce squid-2.6.4-r2.ebuild 6618
@@ -64,10 +62,14 @@ EBUILD squid-2.6.5.ebuild 6618 RMD160 7a03da7fc2bc2632a80079d58f0f3ad43fae433c S
 MD5 392006b5ee870ea8e8c51cfaf28ba5ef squid-2.6.5.ebuild 6618
 RMD160 7a03da7fc2bc2632a80079d58f0f3ad43fae433c squid-2.6.5.ebuild 6618
 SHA256 0dd4136bc9544a17320b7534d54a87d7150a097e79189f1759a03513b451c940 squid-2.6.5.ebuild 6618
-MISC ChangeLog 30349 RMD160 2c0da61c26e38ceb3cb0fc174cb0e62dcccb8dd0 SHA1 872a27a321fe5c3b45d788d8e1996985475d35f7 SHA256 2f994803cc6ff7e4982813186217bf61bf5d71f1667ed71f119687ec7e0d7173
-MD5 a34de28f15ff00acd1e1678367392be3 ChangeLog 30349
-RMD160 2c0da61c26e38ceb3cb0fc174cb0e62dcccb8dd0 ChangeLog 30349
-SHA256 2f994803cc6ff7e4982813186217bf61bf5d71f1667ed71f119687ec7e0d7173 ChangeLog 30349
+EBUILD squid-2.6.6.ebuild 6122 RMD160 4d1266ef2eceee3ca9d16a48a7a9bd5e589d4573 SHA1 674b8a61cabc87505cb81b22477538e9dba9d0d2 SHA256 0460a03819df92d4a4d8c25c9c0974c4517b394fd235edead383aa8faeab9438
+MD5 085ab5ea942afaf3e37b0e9ca427a57c squid-2.6.6.ebuild 6122
+RMD160 4d1266ef2eceee3ca9d16a48a7a9bd5e589d4573 squid-2.6.6.ebuild 6122
+SHA256 0460a03819df92d4a4d8c25c9c0974c4517b394fd235edead383aa8faeab9438 squid-2.6.6.ebuild 6122
+MISC ChangeLog 30523 RMD160 495c68580a261d996accc66882a813f7e2e633eb SHA1 0281f964bdf685151e69ff18024e04182c21f95c SHA256 26351efcf496351ab7d4d5bab2097025c87da0a0a579dea5965b427cad1d2c52
+MD5 6028fe141cb72393c2bbe3347f9a4376 ChangeLog 30523
+RMD160 495c68580a261d996accc66882a813f7e2e633eb ChangeLog 30523
+SHA256 26351efcf496351ab7d4d5bab2097025c87da0a0a579dea5965b427cad1d2c52 ChangeLog 30523
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -84,12 +86,19 @@ SHA256 34af136654198a96d6fdad147b0b0a49c6216f14baa08625373fca5b96ed5e95 files/di
 MD5 94e9eea9d8b6b6cad4263131af7c7887 files/digest-squid-2.5.14 563
 RMD160 5b862305d93ac58ec4907ee9dc7a98671d5e1077 files/digest-squid-2.5.14 563
 SHA256 1727923e9880a2d267ed0cc7cbc782c1617aa8b5a9161ad7c6dc255870f1c916 files/digest-squid-2.5.14 563
-MD5 1bf029faae01373cee9f51fd7492fb18 files/digest-squid-2.6.3 852
-RMD160 b534859ed81bdaef649a93f4c9763c1ecb9c21f8 files/digest-squid-2.6.3 852
-SHA256 6de8efdb0f77fcd3fda484e7eff2934837b702d0e442358f4b212243a3f0e4c7 files/digest-squid-2.6.3 852
 MD5 0cd0b76791bf2bdd9ac30fd20138393f files/digest-squid-2.6.4-r2 554
 RMD160 f249a74c2deb7fbf3138f8751562febad8016e95 files/digest-squid-2.6.4-r2 554
 SHA256 6194b86ac425ead2f71ea960ef4e4e4b060a69b7af7001166a3955eaebcc4bbe files/digest-squid-2.6.4-r2 554
 MD5 cf556b2b4afe6d8a8f02a43e0252746a files/digest-squid-2.6.5 554
 RMD160 77a49ad5979119860725a304f19b516bbb3e2aae files/digest-squid-2.6.5 554
 SHA256 c691f9d5c16ba2a14ce66add145963b4c3cdb58a5442e6365e7f74e20201a838 files/digest-squid-2.6.5 554
+MD5 6f8a61bcb61b59cc3fe028be4f8a8534 files/digest-squid-2.6.6 554
+RMD160 034ccaed8777131ddc2e8861edb19c1ed4a213fd files/digest-squid-2.6.6 554
+SHA256 401bcaf9999373992ebcf94f0c8f754e9d6a8e70ccc2539fb9af03a0c73e3811 files/digest-squid-2.6.6 554
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFiGAH3sf9c6kjmR8RAoZSAJ0aY+R4dIoxe+XSSy9oZR36dMn+wQCgs4MF
+c8uVxNWwyxoEYsgprtB/dyc=
+=fJRq
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.3 b/net-proxy/squid/files/digest-squid-2.6.3
deleted file mode 100644
index b40d89d862fc..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4fb0129f209d972f24b9dfedfb46f2d5 squid-2.6.STABLE3-patches-20060819.tar.gz 4832
-RMD160 0bab6b6b9d0df4da9e30a1c2e7e0d9fdd63c8057 squid-2.6.STABLE3-patches-20060819.tar.gz 4832
-SHA256 b096aada8aa92502a05ef96b572f00f6f5127907ba5cfe39d5441a396781cde3 squid-2.6.STABLE3-patches-20060819.tar.gz 4832
-MD5 46c7aead450c50c7d10a541b89c62d0e squid-2.6.STABLE3-patches-20061007.tar.gz 7371
-RMD160 f50c838e64501aeff6409840a998a6483791cf42 squid-2.6.STABLE3-patches-20061007.tar.gz 7371
-SHA256 c156f49d3b6b5c4cb263b20308c3fa219780d01b29a4c5f8ef3bfaa611238830 squid-2.6.STABLE3-patches-20061007.tar.gz 7371
-MD5 f8b48839e9ff2c45b1989d2ce59423fa squid-2.6.STABLE3.tar.gz 1599876
-RMD160 7b13a91f0809b94c1dacc11a9fe9366fd4362395 squid-2.6.STABLE3.tar.gz 1599876
-SHA256 293c9b8ea4c5fa19e8df92d86e9554081b66454bd97b0acdf0bbb289845614a6 squid-2.6.STABLE3.tar.gz 1599876
diff --git a/net-proxy/squid/squid-2.6.3.ebuild b/net-proxy/squid/squid-2.6.3.ebuild
deleted file mode 100644
index db3786b5512e..000000000000
--- a/net-proxy/squid/squid-2.6.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# 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.6.3.ebuild,v 1.7 2006/10/07 05:10:25 mrness Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
-
-#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="20061007"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	zero-penalty-hit? ( mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz )
-	!zero-penalty-hit? ( mirror://gentoo/${S_PP}-patches-20060819.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp selinux logrotate zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux \
-	underscores customlog follow-xff" #Dead flags; should be removed when <squid-2.6.1 versions are removed
-
-RDEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	ssl? ( >=dev-libs/openssl-0.9.7j )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-
-	use underscores && ewarn "underscores USE flag has no effect (the option is available through allow_underscore configuration directive)."
-	use customlog && ewarn "customlog USE flag has no effect (the correspondent patch has been included in the main version)."
-	use follow-xff && ewarn "follow-xff USE flag has no effect (the correspondent patch has been included in the main version)."
-}
-
-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
-	EPATCH_SUFFIX="patch"
-	epatch "${WORKDIR}/patch"
-
-	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
-		helpers/basic_auth/*/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-
-	local ext_helpers="ip_user,session,unix_group,wbinfo_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-
-	# 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
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-		if kernel_is ge 2 6 ; then
-			myconf="${myconf} --enable-epoll"
-		fi
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	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 \
-		--datadir=/usr/share/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" \
-		--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-follow-x-forwarded-for \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/lib/squid/ncsa_auth
-	fowners root:squid /usr/lib/squid/pam_auth
-	fperms 4750 /usr/lib/squid/ncsa_auth
-	fperms 4750 /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/share/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" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /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
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-}
-- 
2.26.2