15 files changed, 23 insertions, 1537 deletions

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 7e372172a6e5..03c0d592941c 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794 RMD160 768c087050681d20d8fa680c1d3e1264ac1863fb SHA1 7e270c59eb25145add5f112a174978cd669419ec SHA256 0ab6611c2cd6fe5f7b57385d7b86b58c6b6aa7158de007d8d56d0546a49892dc
+MD5 e310b7604b6d8da5fa03f4ad4973d2a5 files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
+RMD160 768c087050681d20d8fa680c1d3e1264ac1863fb files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
+SHA256 0ab6611c2cd6fe5f7b57385d7b86b58c6b6aa7158de007d8d56d0546a49892dc files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
+AUX squid-2.6.9-gentoo.patch 13282 RMD160 8c05b600666bcaf5c56793ad2df4ee01acb40a86 SHA1 2a679c35b43d18f001c424909c07a3087a089066 SHA256 d7c010097c477bfd6ecdaa58df6f9e5aba4e0e133b7873e4ff842820180cc26c
+MD5 ad27c78bfc84cc29c5e9d1c558444325 files/squid-2.6.9-gentoo.patch 13282
+RMD160 8c05b600666bcaf5c56793ad2df4ee01acb40a86 files/squid-2.6.9-gentoo.patch 13282
+SHA256 d7c010097c477bfd6ecdaa58df6f9e5aba4e0e133b7873e4ff842820180cc26c files/squid-2.6.9-gentoo.patch 13282
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
@@ -25,89 +33,35 @@ AUX squid.pam 315 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 SHA1 f694dbc62
 MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315
 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 files/squid.pam 315
 SHA256 dec9bd5ea16977fa334db04eb657e0598af411dad7ff279acf86beddcd22a8fd files/squid.pam 315
-DIST squid-2.5.STABLE12-patches-20051123.tar.gz 21598 RMD160 d16104157b31dc38f9366e3ccf21c8d563ae5346 SHA1 a4d90f6f56442e8c27941c1d4c047fb032dbb307 SHA256 cca5c302eb68c2cd246b032672151ae934272a3d2c8f9238707048676e2936af
-DIST squid-2.5.STABLE12-patches-20060124.tar.gz 23027 RMD160 aef2819961b8af4b87bbb874062d2c4ba2cac009 SHA1 366188a6691b0388680dc3315f70df2cb6154dba SHA256 76c32721e3f0a9af30926445eb307b4757dfa47803bfd2fed4c8930a7191907d
-DIST squid-2.5.STABLE12.tar.gz 1394653 RMD160 ce2b368915e5f927a59b6aeaabecbd1911d66329 SHA1 c47480d9130c1857e2fe54ea2e3acb47b8ed760a SHA256 9a5e0a2bc7ed4202e536c059532884a6c45de9a234520b886b2f891f861d3f0f
-DIST squid-2.5.STABLE13-patches-20060325.tar.gz 23020 RMD160 504261a17070faea4ca34053245add3aa52e9615 SHA1 6758320c88f1a95818435d8672d550f008e154c2 SHA256 d76977108bab1753471e1a9d6c5910d7d744820c88c2a2eee2b0fd53b6bceb26
-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.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
 DIST squid-2.6.STABLE7-patches-20070116.tar.gz 7165 RMD160 4df56f7a82d0462537ed0a9c16943c99df5d3f4b SHA1 3ce0fff6708c2bdec0d286568f4cd279611a1350 SHA256 2ef51e75fc6c01d2613e6db7a2ecc4661718d8239a6d80ff42a510757ef90d1d
 DIST squid-2.6.STABLE7.tar.gz 1624607 RMD160 78715604c7dff188f0ee957e97c983ed90a770e6 SHA1 a84d80bc12d812503254f99dc969c6886c0584a0 SHA256 c4e2cdc1c01b33e1c25db01e09e12193f91fc47f74553ef89c369374c2699c61
-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
-SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249 squid-2.5.12-r1.ebuild 6753
-EBUILD squid-2.5.12.ebuild 6412 RMD160 4eddd2fa8934291b6dd5f8cf360be2ff84f6e713 SHA1 f43d70d140dd9195588941fdfcb2ce30e38cad28 SHA256 5707e3d96515e6259761bae3f7ee61ff0c65e73dff47e558674c22b3a794e684
-MD5 ac886689f2b0bcdeb4a449ff6069541f squid-2.5.12.ebuild 6412
-RMD160 4eddd2fa8934291b6dd5f8cf360be2ff84f6e713 squid-2.5.12.ebuild 6412
-SHA256 5707e3d96515e6259761bae3f7ee61ff0c65e73dff47e558674c22b3a794e684 squid-2.5.12.ebuild 6412
-EBUILD squid-2.5.13.ebuild 6753 RMD160 73cd8b38f70e904ba8973145c14392b388ed0023 SHA1 5eda806a930d3e0cf5e776528cf8bd8486ab9dc1 SHA256 6fd18b09fbebda607a7abb1b85970bd2c8eb73fb0ddec10267708e78509c7128
-MD5 835c1d870befdec62d3062a016d433d9 squid-2.5.13.ebuild 6753
-RMD160 73cd8b38f70e904ba8973145c14392b388ed0023 squid-2.5.13.ebuild 6753
-SHA256 6fd18b09fbebda607a7abb1b85970bd2c8eb73fb0ddec10267708e78509c7128 squid-2.5.13.ebuild 6753
-EBUILD squid-2.5.14.ebuild 6521 RMD160 40d78192f73c483de1fa06d4434ab61ed8f9a66e SHA1 f20238f414da7845211d55567915121d8d949cb7 SHA256 320a9f9fb23e294c1eb406789b95ed98bf34e860234682f0b09222b2f21e5da7
-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.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
-SHA256 eda3ab47259e1b12a5200edc102ea890271637ba14d76ecaa11f0e5b0e98d8e3 squid-2.6.4-r2.ebuild 6618
-EBUILD squid-2.6.5.ebuild 6613 RMD160 1adbf2785bd0476c2268c9d8f115c9ce326e837c SHA1 d82648b472b9acb5ead0d212e02a2d7c0ae887eb SHA256 5c368754cc9c97d35463eb47159353fce3353119437eb865ad7193bd197d3048
-MD5 25b05ba83f82bb6cde9d67ed7d0946a8 squid-2.6.5.ebuild 6613
-RMD160 1adbf2785bd0476c2268c9d8f115c9ce326e837c squid-2.6.5.ebuild 6613
-SHA256 5c368754cc9c97d35463eb47159353fce3353119437eb865ad7193bd197d3048 squid-2.6.5.ebuild 6613
-EBUILD squid-2.6.6-r2.ebuild 6082 RMD160 9db9969774fb53fcfc005cbe9b3a2d7096514506 SHA1 c53301893b9309df09e0bd52dc13958c0ee74385 SHA256 1829b222bc9ae18eb2ac1726e02cb3ffcc5d551b65a91866c11119393e85fb0b
-MD5 d96e638ac249fd6fd155e91d8811039a squid-2.6.6-r2.ebuild 6082
-RMD160 9db9969774fb53fcfc005cbe9b3a2d7096514506 squid-2.6.6-r2.ebuild 6082
-SHA256 1829b222bc9ae18eb2ac1726e02cb3ffcc5d551b65a91866c11119393e85fb0b squid-2.6.6-r2.ebuild 6082
+DIST squid-2.6.STABLE9.tar.gz 1625942 RMD160 293ac5ad2d40f50c42fbee64576f12b72d493c8e SHA1 ba09f5cb4aadc535d63bb0fda564fcacb67b2e4c SHA256 8d68c61eb07c2cdaf82d9b6a4babff3eade3ae864cb1f094b7115086b20d070e
 EBUILD squid-2.6.7.ebuild 6071 RMD160 1c91ed9abdea7f1f06b0211635d4ced136ef7835 SHA1 6cb3c7cfa4775812e3be59bc63ca77a4faa878c4 SHA256 cca9c9eb4a52f5600210198ff6250751de65334e19b17d5fa5c1bf677e008579
 MD5 9821afa2318f7a6d9195a6c2e4c92048 squid-2.6.7.ebuild 6071
 RMD160 1c91ed9abdea7f1f06b0211635d4ced136ef7835 squid-2.6.7.ebuild 6071
 SHA256 cca9c9eb4a52f5600210198ff6250751de65334e19b17d5fa5c1bf677e008579 squid-2.6.7.ebuild 6071
-MISC ChangeLog 32036 RMD160 c5fa56a0509658ea6a1c462ca1c5033f3270ed46 SHA1 69bf38624626c8b48349b2e0710d924508488387 SHA256 ed863ca062c2ee0af83953abfd7d6f04c3a464a955d2ec3a8c4efd6639dd496b
-MD5 49befdb06253afa67af32a71a218c51c ChangeLog 32036
-RMD160 c5fa56a0509658ea6a1c462ca1c5033f3270ed46 ChangeLog 32036
-SHA256 ed863ca062c2ee0af83953abfd7d6f04c3a464a955d2ec3a8c4efd6639dd496b ChangeLog 32036
+EBUILD squid-2.6.9.ebuild 5939 RMD160 d852bed2aed1dffa76a143f24df607550fbb2774 SHA1 73dcf4cc5dc8f76c417fced40f888a9f9bde0073 SHA256 fa5eae0b4f2a4406e4407766e15ec4b1360242127639c8405c6b509ce6498520
+MD5 52cf35cc210d1152272232c15f2718aa squid-2.6.9.ebuild 5939
+RMD160 d852bed2aed1dffa76a143f24df607550fbb2774 squid-2.6.9.ebuild 5939
+SHA256 fa5eae0b4f2a4406e4407766e15ec4b1360242127639c8405c6b509ce6498520 squid-2.6.9.ebuild 5939
+MISC ChangeLog 32436 RMD160 35122067313d64c3a35ee0bed039915a587a7c71 SHA1 6bbd20f21084523bc213e1277515e1537a3223dd SHA256 d9cdffe9cc1061f520c5d758363adc683ea314fff3113a6e64a06cbd2a29723c
+MD5 27409a0fe3d6ed5068800bb7fbc80b2e ChangeLog 32436
+RMD160 35122067313d64c3a35ee0bed039915a587a7c71 ChangeLog 32436
+SHA256 d9cdffe9cc1061f520c5d758363adc683ea314fff3113a6e64a06cbd2a29723c ChangeLog 32436
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87 metadata.xml 229
-MD5 8d31bb67b8d482af9deb6b5ae8151e8b files/digest-squid-2.5.12 563
-RMD160 d4409fe33dfd3758d077145e4697d87615fead6e files/digest-squid-2.5.12 563
-SHA256 ff17e3a44f2032593a3bd496eeebcf8a2bda464b148676c708240ab180bc73c0 files/digest-squid-2.5.12 563
-MD5 165a5bed013f88f73f2e73aa6a1994a3 files/digest-squid-2.5.12-r1 563
-RMD160 cbafbbd19367def03b68c2aa77969b3d472d1eef files/digest-squid-2.5.12-r1 563
-SHA256 f5e80222d1e7cedc675a9d7169b3863f67f9edf7fb7e579741838570bdf04be2 files/digest-squid-2.5.12-r1 563
-MD5 b264ea2120ea4f9d9dd6bdc9bdf53e1c files/digest-squid-2.5.13 563
-RMD160 a5ff37bf6f2e8d3877610badcef222431bb9db45 files/digest-squid-2.5.13 563
-SHA256 34af136654198a96d6fdad147b0b0a49c6216f14baa08625373fca5b96ed5e95 files/digest-squid-2.5.13 563
-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 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-r2 554
-RMD160 034ccaed8777131ddc2e8861edb19c1ed4a213fd files/digest-squid-2.6.6-r2 554
-SHA256 401bcaf9999373992ebcf94f0c8f754e9d6a8e70ccc2539fb9af03a0c73e3811 files/digest-squid-2.6.6-r2 554
 MD5 5a1e44725f0f6da3a63f95721a3fe4e0 files/digest-squid-2.6.7 554
 RMD160 be687a353ce0c44ae93e2c4a986af23f0dda7e12 files/digest-squid-2.6.7 554
 SHA256 dbfcd684010150818fae13125c64f85b792786a412ac4d58703b8a437468b689 files/digest-squid-2.6.7 554
+MD5 abce45f2679e15f9efb147ed7492b6bd files/digest-squid-2.6.9 256
+RMD160 d75f3cc9f3a1889d5d91ce2cc41e9a983955f9e8 files/digest-squid-2.6.9 256
+SHA256 9ed721fecb9f6488cf0dc959522f0f515f315e7c1641bd164917cfea2e75d58f files/digest-squid-2.6.9 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD4DBQFFsxciJnxX6mF440QRAlhaAKCPor/kUFV5mpVIFcnTaBkO7E9s8ACYspeA
-sVAV3BdPPtCrkmeWq7GSeQ==
-=7yLJ
+iD8DBQFFuxi+JnxX6mF440QRAvExAJ4wPlMyyaAQSXVDU3o0Uk6dwKgnhwCfUNJ+
+Zxsya/nvVuS7St1l/bpDPhg=
+=ojty
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.5.12 b/net-proxy/squid/files/digest-squid-2.5.12
deleted file mode 100644
index dc8aa77ef3b2..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.12
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ef9c292c2458a8d11e2ee2a569fbc408 squid-2.5.STABLE12-patches-20051123.tar.gz 21598
-RMD160 d16104157b31dc38f9366e3ccf21c8d563ae5346 squid-2.5.STABLE12-patches-20051123.tar.gz 21598
-SHA256 cca5c302eb68c2cd246b032672151ae934272a3d2c8f9238707048676e2936af squid-2.5.STABLE12-patches-20051123.tar.gz 21598
-MD5 de6238427bed63728970b7e3d6cba40a squid-2.5.STABLE12.tar.gz 1394653
-RMD160 ce2b368915e5f927a59b6aeaabecbd1911d66329 squid-2.5.STABLE12.tar.gz 1394653
-SHA256 9a5e0a2bc7ed4202e536c059532884a6c45de9a234520b886b2f891f861d3f0f squid-2.5.STABLE12.tar.gz 1394653
diff --git a/net-proxy/squid/files/digest-squid-2.5.12-r1 b/net-proxy/squid/files/digest-squid-2.5.12-r1
deleted file mode 100644
index c8a2a5b17d2a..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.12-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 33f76d99bccd759e35c52479fe3009ad squid-2.5.STABLE12-patches-20060124.tar.gz 23027
-RMD160 aef2819961b8af4b87bbb874062d2c4ba2cac009 squid-2.5.STABLE12-patches-20060124.tar.gz 23027
-SHA256 76c32721e3f0a9af30926445eb307b4757dfa47803bfd2fed4c8930a7191907d squid-2.5.STABLE12-patches-20060124.tar.gz 23027
-MD5 de6238427bed63728970b7e3d6cba40a squid-2.5.STABLE12.tar.gz 1394653
-RMD160 ce2b368915e5f927a59b6aeaabecbd1911d66329 squid-2.5.STABLE12.tar.gz 1394653
-SHA256 9a5e0a2bc7ed4202e536c059532884a6c45de9a234520b886b2f891f861d3f0f squid-2.5.STABLE12.tar.gz 1394653
diff --git a/net-proxy/squid/files/digest-squid-2.5.13 b/net-proxy/squid/files/digest-squid-2.5.13
deleted file mode 100644
index c4bb82d84bbf..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.13
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8f15070ca10fec0f39598bb1c4c751a7 squid-2.5.STABLE13-patches-20060325.tar.gz 23020
-RMD160 504261a17070faea4ca34053245add3aa52e9615 squid-2.5.STABLE13-patches-20060325.tar.gz 23020
-SHA256 d76977108bab1753471e1a9d6c5910d7d744820c88c2a2eee2b0fd53b6bceb26 squid-2.5.STABLE13-patches-20060325.tar.gz 23020
-MD5 a9427d8c21b27b1c6fd650315f1b7d2b squid-2.5.STABLE13.tar.gz 1399833
-RMD160 5b66a9ef004f3fcb1225cd0378431f7ee4d005b6 squid-2.5.STABLE13.tar.gz 1399833
-SHA256 e8a5330a5f0e79394612ef57d2bf48658551787062055ffba94eb0bc67355b1a squid-2.5.STABLE13.tar.gz 1399833
diff --git a/net-proxy/squid/files/digest-squid-2.5.14 b/net-proxy/squid/files/digest-squid-2.5.14
deleted file mode 100644
index 58922a7c4994..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9b657ea621e75a457b7db32fa794642f squid-2.5.STABLE14-patches-20060619.tar.gz 23811
-RMD160 a2779367052e0ac2a8ab085c78ad29de41b6f166 squid-2.5.STABLE14-patches-20060619.tar.gz 23811
-SHA256 0688f218779317304195aa2f728f6599635d34528882b23eb8461ca4cfa55319 squid-2.5.STABLE14-patches-20060619.tar.gz 23811
-MD5 26ccd46f232a7f85a42834e0c8953176 squid-2.5.STABLE14.tar.gz 1399962
-RMD160 abe464ab115b3f9541d3890fd413044f526ab5f0 squid-2.5.STABLE14.tar.gz 1399962
-SHA256 3ddb16abfe51f5fcbab66d2ca6a6e25341ed470eb7eb1415111401b9e20ba5f2 squid-2.5.STABLE14.tar.gz 1399962
diff --git a/net-proxy/squid/files/digest-squid-2.6.4-r2 b/net-proxy/squid/files/digest-squid-2.6.4-r2
deleted file mode 100644
index 833e75cf798c..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.4-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 950ad860e6b07fb31744980319962abe squid-2.6.STABLE4-patches-20061016.tar.gz 7261
-RMD160 99571e719c8cffa77552967fdb788aa712a6d59f squid-2.6.STABLE4-patches-20061016.tar.gz 7261
-SHA256 9493ed808920b89d527c26309a0b94a17ea35ac0da2acf65cc91547cf9a151c6 squid-2.6.STABLE4-patches-20061016.tar.gz 7261
-MD5 b29affd7dd5b57ca4fdcfdb177c4e402 squid-2.6.STABLE4.tar.gz 1627562
-RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 squid-2.6.STABLE4.tar.gz 1627562
-SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0 squid-2.6.STABLE4.tar.gz 1627562
diff --git a/net-proxy/squid/files/digest-squid-2.6.5 b/net-proxy/squid/files/digest-squid-2.6.5
deleted file mode 100644
index 2f2b5b10b04b..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 778372da42690ec03c44df5b5908c7be squid-2.6.STABLE5-patches-20061108.tar.gz 7328
-RMD160 dc9bb2a41a23b17ec2dce6cbc98d1bcd55e2e566 squid-2.6.STABLE5-patches-20061108.tar.gz 7328
-SHA256 d85c50d0f2716f35b6a230fdb1cea624383a7522b4292f088e6e8bf9588295fb squid-2.6.STABLE5-patches-20061108.tar.gz 7328
-MD5 f2ec9d9e376974b5af4c7bb94d6ee852 squid-2.6.STABLE5.tar.gz 1622608
-RMD160 4f3f248678c76b5a289b40cc0279333d40a81ae5 squid-2.6.STABLE5.tar.gz 1622608
-SHA256 e860d12d4147360e03ff6ab5c6b88d6af106332fdd2e85d060d39efbd8a88a36 squid-2.6.STABLE5.tar.gz 1622608
diff --git a/net-proxy/squid/files/digest-squid-2.6.6-r2 b/net-proxy/squid/files/digest-squid-2.6.6-r2
deleted file mode 100644
index f23d0d08d271..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.6-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 02662bee48e9429bccb371fe32bbf68e squid-2.6.STABLE6-patches-20061219.tar.gz 7164
-RMD160 70e6af41dbb512603a70c1f1be68497c43213f1a squid-2.6.STABLE6-patches-20061219.tar.gz 7164
-SHA256 6d4799e2ca21fb8dc5722be36df7064d9d01c0f153b2ecb87f34618991e9e5f1 squid-2.6.STABLE6-patches-20061219.tar.gz 7164
-MD5 9e10815ed542fefa06fbcaefdfcb05b3 squid-2.6.STABLE6.tar.gz 1623289
-RMD160 de0d7d22ab7fedb77e8034fe2028610c9303257f squid-2.6.STABLE6.tar.gz 1623289
-SHA256 ed02b22dfe0980ccbbe76144fd95c52128319f53e0dd35232bd6a73b6182ab2c squid-2.6.STABLE6.tar.gz 1623289
diff --git a/net-proxy/squid/squid-2.5.12-r1.ebuild b/net-proxy/squid/squid-2.5.12-r1.ebuild
deleted file mode 100644
index 8be74466c4d6..000000000000
--- a/net-proxy/squid/squid-2.5.12-r1.ebuild
+++ /dev/null
@@ -1,211 +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.5.12-r1.ebuild,v 1.8 2006/04/15 16:10:34 cryos Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic
-
-#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="20060124"
-
-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"
-
-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"
-
-S="${WORKDIR}/${S_PP}"
-
-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 = '$(bindnow-flags)':' \
-		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"
-
-	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 "make install failed"
-
-	#--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
-	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/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" 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
-	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
-	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
-}
diff --git a/net-proxy/squid/squid-2.5.12.ebuild b/net-proxy/squid/squid-2.5.12.ebuild
deleted file mode 100644
index be3c182fb182..000000000000
--- a/net-proxy/squid/squid-2.5.12.ebuild
+++ /dev/null
@@ -1,206 +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.5.12.ebuild,v 1.11 2006/02/07 21:43:41 blubb Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic
-
-#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="20051123"
-
-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 = '$(bindnow-flags)':' \
-		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"
-
-	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" 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
-	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.13.ebuild b/net-proxy/squid/squid-2.5.13.ebuild
deleted file mode 100644
index fa3c4bbe5643..000000000000
--- a/net-proxy/squid/squid-2.5.13.ebuild
+++ /dev/null
@@ -1,211 +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.5.13.ebuild,v 1.6 2006/05/25 16:03:49 gmsoft Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic
-
-#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="20060325"
-
-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"
-
-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"
-
-S="${WORKDIR}/${S_PP}"
-
-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 = '$(bindnow-flags)':' \
-		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"
-
-	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 "make install failed"
-
-	#--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
-	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/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" 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
-	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
-	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
-}
diff --git a/net-proxy/squid/squid-2.5.14.ebuild b/net-proxy/squid/squid-2.5.14.ebuild
deleted file mode 100644
index 378d9898e9d2..000000000000
--- a/net-proxy/squid/squid-2.5.14.ebuild
+++ /dev/null
@@ -1,202 +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.5.14.ebuild,v 1.10 2006/09/28 15:37:11 blubb Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic
-
-#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="20060619"
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff \
-	pf-transparent ipf-transparent"
-
-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 )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/${S_PP}"
-
-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 = '$(bindnow-flags)':' \
-		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() {
-	local basic_modules="getpwnam,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}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	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
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		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 \
-		--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-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 snmp) \
-		$(use_enable ssl) \
-		$(use_enable follow-xff follow-x-forwarded-for) \
-		--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/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" 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
-	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
-	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
-}
diff --git a/net-proxy/squid/squid-2.6.4-r2.ebuild b/net-proxy/squid/squid-2.6.4-r2.ebuild
deleted file mode 100644
index f43ea5cb6da2..000000000000
--- a/net-proxy/squid/squid-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,201 +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.4-r2.ebuild,v 1.5 2006/12/03 20:00:27 corsair 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="20061016"
-
-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
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.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
-	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
-	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-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*
-
-	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
-
-	#Remove this after all versions prior to 2.6.4 has been removed from the tree
-	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
-		rm "${ROOT}/etc/squid/errors"
-	fi
-}
-
-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
-	ewarn "/etc/squid/errors symlink has been removed from your system."
-	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}
diff --git a/net-proxy/squid/squid-2.6.5.ebuild b/net-proxy/squid/squid-2.6.5.ebuild
deleted file mode 100644
index a9db451f30b1..000000000000
--- a/net-proxy/squid/squid-2.6.5.ebuild
+++ /dev/null
@@ -1,201 +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.5.ebuild,v 1.6 2006/12/31 00:55:32 kloeri 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="20061108"
-
-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
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.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
-	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
-	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-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*
-
-	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
-
-	#Remove this after all versions prior to 2.6.4 has been removed from the tree
-	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
-		rm "${ROOT}/etc/squid/errors"
-	fi
-}
-
-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
-	ewarn "/etc/squid/errors symlink has been removed from your system."
-	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}
diff --git a/net-proxy/squid/squid-2.6.6-r2.ebuild b/net-proxy/squid/squid-2.6.6-r2.ebuild
deleted file mode 100644
index 5339b61d65d4..000000000000
--- a/net-proxy/squid/squid-2.6.6-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.6-r2.ebuild,v 1.1 2007/01/08 16:16:41 mrness Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-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="20061219"
-
-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
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.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"
-
-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
-}
-
-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 zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
-	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 && linux_chkconfig_present EPOLL ; 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)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--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-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		${myconf} || die "econf failed"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	#some clean ups
-	rm -f "${D}"/usr/bin/Run*
-
-	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
-
-	#Remove this after all versions prior to 2.6.4 has been removed from the tree
-	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
-		rm "${ROOT}/etc/squid/errors"
-	fi
-}
-
-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
-	ewarn "/etc/squid/errors symlink has been removed from your system."
-	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}