Remove vulnerable versions

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

11 files changed, 22 insertions, 1996 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 7809f2032b8d..1a201624d83e 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.421 2013/07/14 17:36:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.422 2013/07/15 20:11:56 eras Exp $
+
+  15 Jul 2013; Eray Aslan <eras@gentoo.org> -files/squid-3.3.3-ncsa_auth.patch,
+  -squid-3.2.10.ebuild, -squid-3.2.11.ebuild, -squid-3.2.9-r1.ebuild,
+  -squid-3.3.3-r1.ebuild, -squid-3.3.3.ebuild, -squid-3.3.4.ebuild,
+  -squid-3.3.5.ebuild, -squid-3.3.7.ebuild:
+  Remove vulnerable versions
 
   14 Jul 2013; Agostino Sarubbo <ago@gentoo.org> squid-3.2.12.ebuild:
   Stable for arm, wrt bug #476562
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 8605de1d9758..e7a3f88a75fc 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,9 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7
 AUX squid-3.2.1-gentoo.patch 4418 SHA256 41da185c1af04590525fc9144c14edd160522b878efc2e62e8a992a001ad38e0 SHA512 08ba6aac7de61aaae9a96c42801dbb8e414a2b8ec7bccd80afb1973f7c9949dacee4011e54d050c7ae46a06d2914ca8a42629af5707c6810b1547e3b66ccd5c0 WHIRLPOOL 2f8ba78840e46a3b8e780b653d8084f9c0e8b4d0793f4b06cb7faf9c6ae32b193de923b411c394278747ad9574cbf317f72f97467fbca386db4c4f1bd0f1ba50
-AUX squid-3.3.3-ncsa_auth.patch 1645 SHA256 0052375ae564bab33dce876bb3bb928d5190f87c9bef62a10a3c88b02b9b325e SHA512 db9a1a649de81e5334b1c85908c4f75e6bcbc80d4ede13c569484879e28b5ac746a8a301dafd1fa126954126c64e4829b27da1fef465d9dde43b179194ed8489 WHIRLPOOL bafc78c0594e377c8a6881e79a3f1e1042dd006e96a1007030bb28b48f9b5988d47da01079a4e94b79ebc20f475379cf23e1d074a43f545b592e98444d51bbf1
 AUX squid-3.3.4-gentoo.patch 4358 SHA256 d52c1c89c81540dfd6c464f7c4245857fdd6cc9e45568a03d4f028fe5feb8bb0 SHA512 b1bfb0a1298e30ce30681b8bcaed292a883f8153e3df61861d1dfd691c5f4d5bc4651531ac69932fcbdc74c5896ed4495d54810203d4c0674ceb49b33454f297 WHIRLPOOL 3b98a43c1cc98d20f28dd5eb096344ff80ec5de1e4e17c4a3b8fb5d89044b6090466bfd3a7e24dfb975d9e02009af900372ee8c791991921def12820a191da97
 AUX squid.confd 540 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec SHA512 db9a9f2d476df279e1f2c9ec6bdec42d0c4cd9117c78e2ce5876855bd91add5c01bf06d34456e9146fe70374b118ae20a8e75bf07254aa335dd3190e11c72d23 WHIRLPOOL 55863f771bb4ffc39dd809e5233bbfce994a8e4345f84d264c427b7d5d571c998b0011b71f878df2ff4d7037da250e62296f9c962a8118532e25af9297471995
 AUX squid.confd-r1 493 SHA256 214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e SHA512 3f92645275e077bcf36e4cd2ccb56812540276d9456bc6f68268010aac57214f0d96b0aff74dc57cbc3446705a9fae8a5bb7a07304afeea45615ebf2cf2b7ab0 WHIRLPOOL 080cfb797ddb49f7c59463eaef0db8c3a6ec5e5da949884e9ccdf54d608b22fb81971aec21fab704c832c86a8c8e3d4795a7b09456c273d7c4bbb65692a68870
@@ -15,45 +14,31 @@ AUX squid.initd-r3 3285 SHA256 9b16b1ab2d3d3411dfcd8ac76b13a0889503ca78e3c612381
 AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
 DIST squid-3.1.23.tar.gz 3489539 SHA256 4633e59925480cc2ea8078e4d78b17dea59a67a71c054b8faa47ba2c1e204401 SHA512 620554273a54be76331dd559446f750dfe838c80e2427cdcfce89ebdb0b70124acc6015fb6f4f1c78d0ecd0e0aaf46ca2cec29e1415525ef72e14d18343a5e72 WHIRLPOOL cb678a25abf69d73f7f5b5774c00374d14c831b09af86678f065dd8001aedc9f4ba5fa8a8d8d8c301ab449e10d25a54d476810e2d5c77583ed604b6173f41bcd
-DIST squid-3.2.10.tar.gz 4114308 SHA256 8def93d019c1f56d89180e2eb45d6e9a8272a7a8bc3cb7c3a7b6cc4aad535e36 SHA512 38da3e18822444f8aea3b864ec19d52101946f1b1f29638b5f726f771a456e3cccfcb90e5b85d6a10b3792814fb3b08cb3c3263584efacf2afd4a98bc3d7e31f WHIRLPOOL 3f8e29edd49f551279f9797fecc1f80b6630dba718d0c35d215d86e2362f5771264c97bece16d2a6e138c95206f891fab0929978e4768038ed9e2e8b05ed2fb8
-DIST squid-3.2.11.tar.gz 4114086 SHA256 24cb67042bd07ce3d750b269c929e2bd1d6e602aa630eea822ef33580f298a18 SHA512 504b291e2f8fe07ca540005086e8d8ab711b703b9a2d1ae0ff9db5a80e57ffef29af61960ad70d2ba1189d04374bd47ad8b55219db53a204a376633270c1c29a WHIRLPOOL 37bc83b3639d75581ddca3e6b2c50586caf3fac95ffb761c08edeaecf5fa3355b53e6a0cda7c7ec6f304ae3f8e9008bc6e5f63137721963e1115b8045b1e3ddd
 DIST squid-3.2.12.tar.gz 4114473 SHA256 78d825c959acf5fd25b5e7e5d9703f17c7252aa8c6271be136f9afd1d64e1fbf SHA512 52a6ada2b9ebcaa8f7d95eff382fe501650c072d41d367b3a17b290a39ef53b3954d90704aef563966bcef571a117fddd7702c452e042c437a978de25d23b3ea WHIRLPOOL 9d515c28b02a83191557d27e4ce24c8fa5fe58e147fe4eb0ad51fe44489a805427a28a7654d752c97e9ddc5c6e0b54a96623450882a6358e86d5106030000fc0
 DIST squid-3.2.13.tar.gz 4115069 SHA256 b6686c12104b6874750d5341fd5b481ab8782111a6776c38460a2aa17247d1a9 SHA512 85adfc6fe73b59b11d86abeeb60dd45995c93fe2457d9f0b827364f519a381b2b843d6fd801bb3f8e2fce216d9e6dcf3c45ce7bcac87a4c1b78ad17fc3856eb8 WHIRLPOOL 33347b075a9a6ba783d5caad2f5b77e395b98bcd751b626c3d2a4ac16909d8637226821e1ee8c6ea336451274bde3d5fc4c8c8f14ec085d79e497a9378e2cbf8
 DIST squid-3.2.9.tar.gz 4113390 SHA256 f8262cb033e93fa806188a3238cb485165cb3ddea0818e6667020f7e68cd3401 SHA512 6463fb2538a0f63abc82ec8acac52cbd0e9a1a1062fd4329ba7d0f07f0e1ba2678e439322bae378eba0a1e99356bd6854bfa266a6b87a12607157fe2f274ef0e WHIRLPOOL c72161e5cb6030c187d16e6864a3cf1ff8475958304fc74a1d9c708090f177b6fcb26a3bcf70ef635b8ffde5aadeb10549c47044e60ad358539e63ec0ba7429d
-DIST squid-3.3.3.tar.gz 4191938 SHA256 2505547a0ff5b24b9f3924a7e4ebcbfd4ce41a160b8d841331edf711c2912138 SHA512 ab87940b0ed3c95f36d8790b653be5c35de9213711e1c6ea57726ebb03f655d9d268279f67fa0fb6f10abf3a20b205294f4261c20fe044e303377d35dce95249 WHIRLPOOL f181ccbca08479baa73571079a36a4f347b36a84aacaa8e3ee481aa3f0d00cf71aed1c512c16a4b0a5158ebac6ffe112b45a95ff3dbf926800fe03b60688324c
-DIST squid-3.3.4.tar.gz 4196008 SHA256 fc87e9d228aea06d048316201d87bd60a8af244408f7153c64383c1f0f751eb9 SHA512 2844dc58c479d522d7bc5893a612b064f116279fc25327e866fcd76c4fc1977d0d5bf57f65b39f5e5f2b0c5b5a22d158c7a575d8a066d8542130385aa2eaa202 WHIRLPOOL d933b4b10cd4ead150770007bc951c737e2a9dc21e80c5483b05cd949b218f2f90dad1d6ee88d3525a65d146b94ddf91e887da139b91158f617e9134c7e94d7a
-DIST squid-3.3.5.tar.gz 4199886 SHA256 08ddbcae113a4b90665ad73bd0ef657951d4155f92fccf7740e467481f7565b7 SHA512 3aa64e0b3a2b3681d89b8f2dd554b79d6b03aa1d4c5ee07db65da15afc03ad7a59a03b7584e0a885a1c10bc8dc9e2ac0c2d6134bafeb8965b548804549ebcb1f WHIRLPOOL f60974c7b0f7108631cdfa094fe24ce1804f7a37a54151a280b89fd7ce6991bd6b5b83e6f45b57ef2ce9ad5d79e497c68ce4e5942a6635f01dc87cc53a49267d
-DIST squid-3.3.7.tar.gz 4201343 SHA256 4934141dc32e77a13e374f8c7d10ef52694252d336f7c1a63688520f2d3b55cd SHA512 a346034bb635dee9bda6dd6a54c997c3bba057bfd3a19dc363acce162bed976750dfbd80bdeb3996c556d7d4a3be2396e580da533690835a7c41ac9de061abd2 WHIRLPOOL 52ccd69320b17f406f374581716a31a558801a348e7f6de7e8a164c1f8060afcc1cc1c5c45376102fc894acc4a2f6e4b69000fcbdccdfd79b341c6c444530c77
 DIST squid-3.3.8.tar.gz 4201652 SHA256 70d12505f2d91a64c05792406e12f2e6bd3082976bb7b6b49c4d982479d8c7d0 SHA512 6a4c95cffc23af44c985d0e897f3f1c66dbe3c282836e7e3724065b132dc59c6c512fd3914893be6a934f2b1fb72ba9a12bc3a1f953624760153616d5818f55f WHIRLPOOL 61c6b5e52138104634dd2ea602f251f10f7925c0ccba1823037d7a064141372d7a064f73d77747e1789b8e875819ca5939384d6a1c266889d07b7e0ee47170df
 EBUILD squid-3.1.23.ebuild 6687 SHA256 a12452feaeadfe2501e168dce2552b244c31e96436a0278bd8b3b5fdde89f34a SHA512 754809af799a7ce243cacee7a7b38dc3e8b51920f1f90f54953529d7e51ef4ab046961bde57c82418bae09034c3f8d98d1405f18659b434338071844e245730e WHIRLPOOL a6f8f792332b0d1e1e366d93e7a87cd2371e5c97ac8b8bab3783a6b830c83e0aa19c6aa8db7da5300c02c6a64e3d07f53cd551fb849daa50f2e5cb5c5bbe5392
-EBUILD squid-3.2.10.ebuild 7823 SHA256 e0d806746973228904ef7f40ebd26041c77257756da70077f2ca5ca3a5b5c2b7 SHA512 051c9564ff9f6cc5b9a3920992f79b272821cc5419b4101ece25bcacb093f236e9d1010cece60ed368644a20d2720315d21b1f46ce1890943a60c5e34e9dae79 WHIRLPOOL 7e9942ba99271a121695594f4fcd58848962e90b3cd7b4af0bea6eed65a4f3d3f6fb8f26261a70a078ec19d3dde424b0474890b6bc8a8cfa28e7241d3837741d
-EBUILD squid-3.2.11.ebuild 7768 SHA256 5dc0933e76506063efa775dfd608371ca55c179121207d22187ad52b59165f0a SHA512 651021bea7c863bcfb406a0ba47a474a04134e994d4dca0a481db1dda904ace2848bf6b51ebd8e2e63f4f800b13d3f256b07707d0db1723c57ba3c1b04f2128c WHIRLPOOL 07d6b30e0d6f797f60a37138f78c952e1d7fb1d95ede2d24b7232b9d00f0ba00f9fa35e887ba3911b1ffffd1f49f616ff185963a5cddb9dae66159ae246dc186
 EBUILD squid-3.2.12.ebuild 7760 SHA256 43be25b780971413db734aafa6f39a1c71c4eab96b0ff594e1b8c2d2d2323d08 SHA512 0be3e5e7cfa3f8c6d209b22580f06aa53aa6b5b849c8cda7174857d7da596ea528bb195832888bddc21e12d490e2d595a227249a265ac178507a9423956c2511 WHIRLPOOL ec35610e9cbf9c565287ca5e42c6131375b3f7633af87433ff620d61d81059bac6d4eef87481fd1daea351e3756d15ce40d8d8edbf58d26bf2a8ebe166401f3b
 EBUILD squid-3.2.13.ebuild 7768 SHA256 27793d32d66a73d64ae9377433bf260d95c5478d5cbf9f29b990f29c1afc3647 SHA512 fa6520095589009067176c160014eac01f6c1034c43a3ae8061ff7ad22c676fbb90fd47462fb61f8171a309782f7b633e1feb18d37a3552f3d13f5a004608aed WHIRLPOOL 1cff834126806917123b5e80679116b6ba0ec3f70508e455c81c8860c3bd9c23ad3dab1ddc3ae1d9679374ae60e32bfb7c9876beb9f9cdf26e480ad214a1c63f
-EBUILD squid-3.2.9-r1.ebuild 7642 SHA256 be2ab045b3dec4fb923d2c44f2db0186c65a0c4a4f13aa69d986a7775402410f SHA512 64c15563e0579a0f405a050e85a4f21aae7286e27a63fe7dd92178973eee77d6e769693515a837b4c82431651f2c29141c015a62854a0b5e8008991f83f16a4c WHIRLPOOL b44e0bc644b697d6b404e5f0f9c3fdb3eaa325b39185ae55e588c5100835af7f7dac2453a9455bfcba0392d5aa49e6e2661554d08e4c9fc6ef4ca1ce753786bd
 EBUILD squid-3.2.9.ebuild 7580 SHA256 d1ed43ace291862d4e34a5b6098501176011611c4dd01f5acfcccb5cf64a1ff4 SHA512 566cf79574665a514fb0a599040cdc930595e7e8824972206694d80b370cd250225744956b8d4d3ebf6ababaa1739e8e5a5f86ec068655cce0fc0460a2613477 WHIRLPOOL 72849f8feac662dd746d65c0ed9218d4bcc4808ef966e94e4fe17b8f0fa44c60585530344750f886c9f3eda89cc363354f442f746947cedfa10a4ffc3239392c
-EBUILD squid-3.3.3-r1.ebuild 7814 SHA256 4a58e13b09f9b13342675cbf898ce06835d40357c0d18865d5ba8fd1aa5aa809 SHA512 2cd2acd611c5c479d0af5a46fee913a52a8cd1f3952433e78a8ac7e70a4b18e1640cfad376e0fb7102ca702e2399b061fc96a5f3ec3db73a9d4ca8bf9aeb5ba6 WHIRLPOOL ee73ae56cb444ca9d737a197b08db86bc59494e2feb9664412dd71f6d6ff2084625966838a9f658481f86aaecd1c855442a60de53341c80b097a50c5b92f4944
-EBUILD squid-3.3.3.ebuild 7589 SHA256 f955c6869c7bc46a85bef075ddf029fabb2b442a10b3999622e60e366a7647f9 SHA512 dfb17e6fab82e28ffca6cab5fce19fce08ca287705adc41083f3271488e2b3940d1c8bc08869a3f8e4f2a9914d693fb23a890dec97d465f31cec1d0838805149 WHIRLPOOL 69ae80af78f82997f1a7113124a50c95f4cceb21b2a854740bc162607755938f1128260837874fd18e5ef49600c72a4c9166039bd4287f4f2a9c79345db569bb
-EBUILD squid-3.3.4.ebuild 7761 SHA256 f913d0b57d16b430bd409f5c71ec7da501c85ed0222821d33d2553df92d7bdee SHA512 3f61218451671d48c8d616689b577e6a98359bd4d509e84fdd2052383186a8ead18c10a166b68d81ff9073afe82e2a6483e57e2e6edeceb4b78eeccb7dea611b WHIRLPOOL c2b36e5b7415a7528b7663e42bb3a3b522ff9981e1b47ab6d51eca1bae0551616a0673917799663be79ef46bed622a36c6473beed7792f026e3752311d15c0ae
-EBUILD squid-3.3.5.ebuild 7761 SHA256 3bb2484ab4ade2bccefd5850d72d21c820ffbba8099dfd35e8613e31df365f34 SHA512 942f58233ec2acb7862a07b56e50f2a637370abd75023efe803e0264e16e9a798e3655544eecd635b1e890e245a2f54bc92496310609d391d9f6545de1c8675a WHIRLPOOL 27f214e4aa2049d614db78eedeef0712a68bfbaf3de1e1cf4c1c43cf8c096e57fb350743400c92ac838c8e3dbea9c00981e3409226d041fa913a912ec0c06f59
-EBUILD squid-3.3.7.ebuild 7761 SHA256 002dc7a47d627a013235d6c800ba0f84204bd677565a1196f01d45dc3121fb11 SHA512 e9e00e3d9850f13c1822e30b5f4e36c648a4faf6588c74c0f74b0e8382d1c6ffafcc4dc3902830ad1664b2ad625d04950ed6332ce2befaeea8c6fb620e1f4080 WHIRLPOOL 3639dfdf9c0495634b7b804571199721a040907576bf43741f9500d63b9064a0f57106c172773beb944ccb9d4798ca6c1ed7c905af892d3c584b304cc34fc8b4
 EBUILD squid-3.3.8.ebuild 7761 SHA256 6d7f2d9298c96eba94c79e47a266837b8cf0339f0a744b29b47af9908c93ceef SHA512 f2bbb4edd890e3062cbd6f12149a269242109964ea98faf3487ecd8c3f26a9b331f90105eeca841dd5665a5031fe53c8e299325af7f769e8bce6350ab616d43b WHIRLPOOL ebef45f47b389e8a73862bbb869ca20ba6cacff4dee77126c323567cf8f3f47769486fce4d45ea632735b8d495f0d7cb919d1bb8e1a0dd3cc23d824b4f6efb27
-MISC ChangeLog 81910 SHA256 778db1a8b4396466768edabac07408491a90d0ac649313a0221b6152a066a31c SHA512 88b1bf6cc02dab85d0e9c9b96f9090b7c11d0aa481e642fc4bf94b690eb09bb5e2de314552ebadb4c91ad09f4a7871273282c69e52f270418d9f5de8d218a21f WHIRLPOOL 9966ebafe692b48dcc1198e4bc8312c14878717995ec0a2b8a1818bf8296c24dca43173a2ce582f04ab5a4292862f34d3f40f07a26c71341d6feaa6b2a76b564
+MISC ChangeLog 82203 SHA256 4da21803ff1a7273d586d53bf443ef72fdce549a75ddaa36b2b949aaa4878757 SHA512 4e2d3d1f7e477d5a1e3b6d54af66bec468b2b9fd63de22e45f7165bbde5f9db3d2f7e91c7b90abaeb7d190253b97a8754d29d691c064496e3a452dd252886dca WHIRLPOOL bbeaca86bf85138eac9d28a65e2c00a4f275cb9619b51a79ba317f78cbef53783d7f4ee723eae5a9b038b758b09dd1c31e2d9d1aa21fb6c07ca6cce455798913
 MISC metadata.xml 1386 SHA256 f1c035d3bfd09b92b127a8281b5d225b261c7a01c87d99e53a002d6316251089 SHA512 603b0c1803b86bf777777107a908db14c138911f92695d7572d448ddc5679c87031151161e1138db046f878421019f7778ef8fcda7218fb7392789124b96e95c WHIRLPOOL adf20b19ab0faf2c4219a16470db04ccb6f06cbbaf1a0b19631f2e01ade5374d9316b7015334b4d5722fb39b8328db61308888f4ad1a99983bf9dc0061f442d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR4uDyAAoJELp701BxlEWfYAoP/0QHx6vltSBt7eoQ1iusQLy5
-dRLoRaj//kZXwQbYxJa7UivOf8f796hk2Se/J1H7/xRsrcBfr1+TnPDBc8UQgces
-h46GUseyHxPIXY81vqUClzEXTpPgZewkIO2ROwolN6tKvbClFbQRVWXL9G/b3c1j
-lWJrirxQuy5MxH006KK9fiicDRJuSBlsRc5tCWgMG0RPlYnIczFVcQlHU0/D1SOI
-xPbfLOOxLgusoeIU4iH4MwFXVj8KDRqbF+7UnkmmfTZfkpgUSptZL7Rz8FxI9hxG
-ABiPtGlgh2a2KaphvTg9gPg1K696MxCMr+REH4/esRsFIDLqQmk8kPyXJU0hKwbk
-B2/4JQMila4Be9LaV+e5gENzKhI5+b5bpSK4wab8TJGicuBvQBMfNV9VYdjyREq4
-GvuGvqRrwiWRlgpYLGuzh9VGReLbxUIiBc0jJXtMpjkFQ1U/D/k3hOGyFicrFS/k
-G0ujUPG6k0sty/yW/+IaCPV6+gqBs51cQBdLwiOaOfR1fjVxfXkoJIiyXvmq2PVB
-TduzutNPx6r5x0POsBwNX+WkzRxB2C+zqKHjuv2kY1K2TQAo11TjL0pt1u49IPmG
-c7XK7K88zKZYNYPQIAxH+gPYGYGCbOuseYs5HmWFHqHJYaatwCKMHzEZrZlZ6sYC
-95ZT0srBpItgjhdeexmz
-=rSd/
+iQIcBAEBCAAGBQJR5FeVAAoJEHfx8XVYajsfLAsP/3Yd+hMn8kRt7M/TRZZernZE
+jUAChhZieCb3V5ghWIeWRVb2w2+XxIOaCuRzC8RCdmfvU2J3z/c7XfMthoddFIWR
+SKb0TQfKdBPtq/dRC1H21tP37Hp3pDrnCEkX2xPOlhpG6o/f+ZIH2h/lR5bK3z0L
+tfJAUcm6gH3LJO+BJjiZxolbn/CxRIM9+yPN0axtBn4QQvANsW80ferrO4dS4uLQ
+WJsUZRiMGnTTHq+W0HgIPp10bivrG5jfnwIKPBOW62alUz0Bm+3V6zuQ8sylvQ3y
+pLQA7tDL46/LICOph89uNWEc5gXWHdeXzCYow/dTsss4WEYgMpRF4uoRwJeV7ks3
+CpkWUqTeaMynnDFfARIFTCCm1hP49wHTAVS0+oYGnnp9oi13PmJiRMoVmHQs9yle
+L6DcEEamMEMSMzx51T6Q6g0LSLPSYImq1MEZjSI6ZmWIVxTQW/t79LJzmLJtC7RF
+CEuXb0DYETowh0ZabuD5ZCtbOfjKgcNdxoiaJN1AMWdTEMGhOHj3ivrFOh9s/plb
+hCsLqhRYXHnu0RQ1B0VI7XZtlx/U39YmAXMLOn+W3DlqV0b9lcbLtfJEgDPZeIlG
+Fse0Ym1n5kgTWesJRENxYP9TrGeFW7iibKmkS9w21aD5Rn3x/CpQBusFnyqDxft4
+Vneb2tBtR0SzLLz8edNX
+=G3LU
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.3.3-ncsa_auth.patch b/net-proxy/squid/files/squid-3.3.3-ncsa_auth.patch
deleted file mode 100644
index 3e4dd4ab6b6d..000000000000
--- a/net-proxy/squid/files/squid-3.3.3-ncsa_auth.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-=== modified file 'helpers/basic_auth/NCSA/basic_ncsa_auth.cc'
---- helpers/basic_auth/NCSA/basic_ncsa_auth.cc	2012-11-15 22:26:23 +0000
-+++ helpers/basic_auth/NCSA/basic_ncsa_auth.cc	2013-04-16 00:26:10 +0000
-@@ -144,19 +144,20 @@
-         rfc1738_unescape(user);
-         rfc1738_unescape(passwd);
-         u = (user_data *) hash_lookup(hash, user);
-+        char *crypted = NULL;
-         if (u == NULL) {
-             SEND_ERR("No such user");
- #if HAVE_CRYPT
--        } else if (strlen(passwd) <= 8 && strcmp(u->passwd, (char *) crypt(passwd, u->passwd)) == 0) {
-+        } else if (strlen(passwd) <= 8 && (crypted = crypt(passwd, u->passwd)) && (strcmp(u->passwd, crypted) == 0)) {
-             // Bug 3107: crypt() DES functionality silently truncates long passwords.
-             SEND_OK("");
--        } else if (strlen(passwd) > 8 && strcmp(u->passwd, (char *) crypt(passwd, u->passwd)) == 0) {
-+        } else if (strlen(passwd) > 8 && (crypted = crypt(passwd, u->passwd)) && (strcmp(u->passwd, crypted) == 0)) {
-             // Bug 3107: crypt() DES functionality silently truncates long passwords.
-             SEND_ERR("Password too long. Only 8 characters accepted.");
- #endif
--        } else if (strcmp(u->passwd, (char *) crypt_md5(passwd, u->passwd)) == 0) {
-+        } else if ( (crypted = crypt_md5(passwd, u->passwd)) && strcmp(u->passwd, crypted) == 0) {
-             SEND_OK("");
--        } else if (strcmp(u->passwd, (char *) md5sum(passwd)) == 0) {
-+        } else if ( (crypted =  md5sum(passwd)) && strcmp(u->passwd, crypted) == 0) {
-             SEND_OK("");
-         } else {
-             SEND_ERR("Wrong password");
-
diff --git a/net-proxy/squid/squid-3.2.10.ebuild b/net-proxy/squid/squid-3.2.10.ebuild
deleted file mode 100644
index f807cd23ddd3..000000000000
--- a/net-proxy/squid/squid-3.2.10.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.10.ebuild,v 1.1 2013/04/29 08:28:30 eras Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit eutils pam toolchain-funcs autotools linux-info user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		lib/libTrie/configure.ac || die
-	sed -i -e '/tools.h/d' \
-		src/ip/Intercept.cc || die
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.2.11.ebuild b/net-proxy/squid/squid-3.2.11.ebuild
deleted file mode 100644
index 3df8ce238c98..000000000000
--- a/net-proxy/squid/squid-3.2.11.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.11.ebuild,v 1.1 2013/04/30 07:25:37 eras Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit eutils pam toolchain-funcs autotools linux-info user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		lib/libTrie/configure.ac || die
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.2.9-r1.ebuild b/net-proxy/squid/squid-3.2.9-r1.ebuild
deleted file mode 100644
index bae68715dc63..000000000000
--- a/net-proxy/squid/squid-3.2.9-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.9-r1.ebuild,v 1.1 2013/04/16 05:02:02 eras Exp $
-
-EAPI=4
-inherit eutils pam toolchain-funcs autotools linux-info user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-3.3.3-ncsa_auth.patch"
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.3.3-r1.ebuild b/net-proxy/squid/squid-3.3.3-r1.ebuild
deleted file mode 100644
index f6593a2b7891..000000000000
--- a/net-proxy/squid/squid-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild,v 1.3 2013/04/26 09:32:25 eras Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-3.3.3-ncsa_auth.patch"
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		lib/libTrie/configure.ac || die
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	tc-export CC AR
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.3.3.ebuild b/net-proxy/squid/squid-3.3.3.ebuild
deleted file mode 100644
index 9526d4770b2d..000000000000
--- a/net-proxy/squid/squid-3.3.3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3.ebuild,v 1.1 2013/03/14 07:49:29 eras Exp $
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.3.4.ebuild b/net-proxy/squid/squid-3.3.4.ebuild
deleted file mode 100644
index 5b506b96cb8a..000000000000
--- a/net-proxy/squid/squid-3.3.4.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.4.ebuild,v 1.1 2013/04/29 08:28:30 eras Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		lib/libTrie/configure.ac || die
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	tc-export CC AR
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.3.5.ebuild b/net-proxy/squid/squid-3.3.5.ebuild
deleted file mode 100644
index 7fdf49ced2c4..000000000000
--- a/net-proxy/squid/squid-3.3.5.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.5.ebuild,v 1.1 2013/05/25 21:54:15 eras Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		lib/libTrie/configure.ac || die
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	tc-export CC AR
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.3.7.ebuild b/net-proxy/squid/squid-3.3.7.ebuild
deleted file mode 100644
index bfdc4ecef928..000000000000
--- a/net-proxy/squid/squid-3.3.7.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.7.ebuild,v 1.1 2013/07/11 17:16:42 eras Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:2 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
-	!<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		lib/libTrie/configure.ac || die
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		helpers/basic_auth/MSNT/README.html \
-		helpers/basic_auth/MSNT/confload.cc \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/README  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
-		helpers/basic_auth/MSNT/README.html || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-		helpers/external_acl/session/ext_session_acl.8 \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-		src/ssl/ssl_crtd.8 || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	use kerberos && negotiate_modules="kerberos,wrapper"
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="smb_lm"
-
-	local ext_helpers="file_userip,session,unix_group"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-	# uclibc does not have aio support - needed for coss (#61175)
-	local storeio_modules="aufs,diskd,rock,ufs"
-	# not stable enough yet
-	#! use elibc_uclibc && storeio_modules+=",coss"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	tc-export CC AR
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--enable-esi \
-		--with-large-files \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		${transparent}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
-	newdoc helpers/basic_auth/LDAP/README README.LDAP
-	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
-	newdoc tools/purge/README README.purge
-	newdoc tools/helper-mux.README README.helper-mux
-	dohtml RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r1" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r3" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
-		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
-		echo
-	fi
-}