Remove old

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

7 files changed, 23 insertions, 1300 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 2fbce33b7af3..2c95f1bf0365 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.518 2015/02/24 10:57:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.519 2015/02/25 10:11:51 eras Exp $
+
+  25 Feb 2015; Eray Aslan <eras@gentoo.org> -files/squid-12683_12681.patch,
+  -squid-3.3.13-r1.ebuild, -squid-3.4.10.ebuild, -squid-3.4.11.ebuild,
+  -squid-3.5.1.ebuild:
+  Remove old
 
   24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> squid-3.4.11-r1.ebuild:
   Stable for alpha, wrt bug #538132
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index fec6faae5aca..fa65ee77c55d 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX squid-12683_12681.patch 8985 SHA256 bef94f856ecbdfb88630bf75b8f1177a1efcba40b32b8ccd61ac2414daf40d75 SHA512 7e148cc62fbe0e3efea8731154b762c40d9e97a12978ff521aa0a90c225ff5b09d54388da671b05495c5c4eb9bf30ef492ad659d293f99a73ee2a0230a9c2f91 WHIRLPOOL 9af1913ab70a889d8fd7937910f5670a0f5b4678ed30df37f34b2bcf7a96640241419f43667f24d82ce7fffd0efa59b31e973658ba9bd4662e4581ca8f68dfaf
 AUX squid-13211_13210.patch 1719 SHA256 2e1e45f4800cb17a5e35fdc5a8add7581e08cb7c0bb39852be63fe84127f3d85 SHA512 764359afa7aa1ccd80b8349a01a6c92eb4c32ca1106776fde5f59b5af71cfeb63cf6d9afc777d12a8e13db46a92ee2d4cd1dc1b79a48fb06c92f433c66b7fb64 WHIRLPOOL 3f9c95888f82d499a9e95de0f49474a06727916d7928e8f8c7ff2ad3bdf14213b60f97d0a4547e8e81f88c16c41c8bc404c04dd93d6788c2bf33b2687d495a7f
 AUX squid-13735_13734.patch 1704 SHA256 895f83d35c438e07c14d1780fcb25ede604ab4ed096cf72bea424396acf82735 SHA512 2bddcbf34413b20c03c0cbc2760cbbb53cf52ef00cefcb02200f74ca7d0f1621ae2c35d37a47bdff6ee705c1c22ad885f94b0c86c719565dfa794447d2719a26 WHIRLPOOL 782c92e8ae83bc3231a6eaf982af6467a386d5751664ae60f1ce1482e740f0d8811617c59963995e2b78382a49a42f6a6f3cee50cecbdfedfb4fe9c827cdc42a
 AUX squid-13934_13933.patch 694 SHA256 cc647f668c8b4df406af6007e342b7864483b7a42904e4af467194c0b2442220 SHA512 60a79fc7462abc3ea577a5e5eaa24a00722629733b9c86df2eb1cc8ca35ae802304d92a5822c74676ba7ac69876aeaac742594f28da846ada6ba8947eab324f8 WHIRLPOOL 80fabcdd07d9fccd8376e808b47b21bf8459fa2a402cec39b9f38ed901d2814151dbd20c8d9e00aa6e4e11a8fae8489f33f654aeff437e35c7b924cc23b6ca96
@@ -11,34 +10,30 @@ AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f
 AUX squid.initd-r4 3370 SHA256 3830cb94600ac658a6ff1f9f31bdbece64caf3ad23c62ae0a887d152970125f5 SHA512 f4edec6d001292ae62bcc6a70f864c334ce3efd8ac7c1b7286e65f330453cbde4d3ec8ef9ca86df7cc2b58795808fe50349a48474165d12e2ffb158d8701e2ba WHIRLPOOL 697be7cd90ef06e8b29d86af26143b6d67e5bae84e89ab717d9f9b495ada6df2c446008c3f881914513127a8f893b9e1732bbd7b1b7c7eef6578e377c4c23baf
 AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
-DIST squid-3.3.13.tar.xz 2187728 SHA256 55d5875709b93f447788526527496956c508832abd1f9c651346e461c9d63221 SHA512 be7ec0ff949f94a4521c6aba2cff87b495ca626c85df5a9650e587c5723f2e52de68e939d8dfed7e8279be7a987c13a773d4f94864308d98d2a67c462b3b2862 WHIRLPOOL faaa5626a97589e486650fa7ff0231487fae65cf7d2ae962f36c7857c97d481c1f82cfd3326bfd0b690543abc01e5581feeaaccd77a8c34ea762abd1ec401f36
-DIST squid-3.4.10.tar.xz 2161192 SHA256 fb6dccf9ba426eddfc7b5dfe8786971f9779c571a53739a8a41024b09b12f888 SHA512 4b90a8cb26947069d5cf2aeb6b7136b65ae3efd55d495f44af772f780b8c3f12de3b155a0992b6ab429efd2dc1461b551eb73db76a088bcc48118d7769c476af WHIRLPOOL 0da554852e2ba7725d1a4f726e231a1b180a0fab90626b53cbe95a2c14b36472a0ed9170f9b10d4709b10769c79a2478c588a88455910c16c2f60e48227ec25e
 DIST squid-3.4.11.tar.xz 2162148 SHA256 b4ede14221d043bbde94655aee195b090fe33a9a0a3d4ed83a9b41fcd46cac1d SHA512 e485e195f6ef95d7d2f5d327d9e229d9b3b678b035595853bc5d9a56a0494536239fa591bd56213014e08f9584e56d3511b0429e9fe9076d6e64a8b09867be69 WHIRLPOOL 5a3b1829eeda2b507971346bab3af142f19c650185940af82a238787b7265ab5e51535e815e1f87f0800071ca3053d8a0195da0ef02d27361e83951c4631ea63
 DIST squid-3.5.1.tar.xz 2281248 SHA256 3a3bc6b424149da5a4816786100f32e47b45e139144726722df3a87a6414d6f4 SHA512 eec2e3c364fe4f6f6b62ede0af8f62d09fe53db0bcd4d302b75470ef2880844ab398b1f8e05473971bb052eb72347078329c0598ccbb5ea7ebf6cb8df34cc858 WHIRLPOOL d6e91e2b3ec3f647f15720037b0016ed5deee0d51a116b5e4ec3a9b79b04a8c301473778f3ea0cbe8e1c75b054b9b9932b6534cd8d5dba11cc8bb9d763e1ca5a
 DIST squid-3.5.2.tar.xz 2282116 SHA256 5af2e16f279466f9fb89c2fef6c09b6824a7e3e7996c9f1c2bc16e7daddd751f SHA512 c6ce7a1dc19919f489b096a4cfb0c9a4787090168d6fadb9ec0519abe5ddb15388477af41cf21586e84027a89c41ac29b02872a014b29273e808cd9fd1f00c27 WHIRLPOOL d8394b6ccc5b98fd50f3be358da4359552086d40407fca8de8991b089e9d79cf142c95cecdf8aca63d295b9b4c88fe4958d1f2fda7291c956dcf0503a6a43041
-EBUILD squid-3.3.13-r1.ebuild 7748 SHA256 04777bfe1e7b0d67d76ace831ce39837c62552bb3c6cfcace7cb3d7454f63306 SHA512 c989367c920025b3592278c237658255d9d4c5f3ddff3732662d0fdb6833ebb55ddd44a1e966965f5cc0c5b5d8113016b1239aabbd6d459adf8fd5a00a636aa2 WHIRLPOOL dd3e5c63ba327ec9af37fd84ae8913e751dc20af51ddea77707742268a13c61d818734cc02389b09e5b39f91cba056515329892ecb9cddc62a24dd8f12eb7cec
-EBUILD squid-3.4.10.ebuild 7957 SHA256 ae31160052f47cfc0586a54eb5ed6f4122ee000cc61fac25d800d2a30ed27985 SHA512 0fd413cf062d7a20b16d890137188c6f3ebfa5349ccc6d0e60730a7ea0d01bd0ab8cafd35795b7a48c918fa0fdd52ac59f033a48b3c2dbb68349e3a8c57463e7 WHIRLPOOL 102cb4b3ec0c311bbe464718f1a6149177f3b360d03379e96dc7615254d8f6c497230d7450ddd174570a451061f901e66ce9e400f4f57c13d44b4c986c4cc00c
 EBUILD squid-3.4.11-r1.ebuild 7977 SHA256 ab9c54453df1a0b3c64978e335d861dfc16aa0fed9f4de9fc8b798fdf154f8c9 SHA512 b832b7e9d950158ad8b6ddbcd0bf2d41f2ca18ac8a5feb612b72217439750a47169cbdbf96a326b5a08ff144b17fe136167408e1ccdc31f0e45d1e5518faff66 WHIRLPOOL 087661e5e603b37679fec373352d540c46819a7eb0fa1749cff230a0edea78b4880b6a4d9179482293c5883ade4ac386d1cf51c13db540649c5a70b10a2df2b0
-EBUILD squid-3.4.11.ebuild 7937 SHA256 b3d10277e14ceb288d9086ff7c424b4312112960a884ec0e163420e72fe35bad SHA512 0165fc2fe6074d66e5bc251d8621385cff4fdcc63f424e2fa9c51e42f98498a5bfd4513949ed8ab25e27457e0ad8399013415d963a2fe2318c5bfcb07192770d WHIRLPOOL 84a531d225397db900a2aa0c48d98090bce7190587d288394ecbcdf472f61f04b87044cf324e52980c998c5c4df64c0402a8d59d6325a418d1661bd7567cee07
 EBUILD squid-3.5.1-r1.ebuild 7671 SHA256 76942f30c8a5bc4412c703619da01854bba5632ab037a6a58188b122a501e62f SHA512 680691fc99af72fb0315d8d26730413f4ba441500df7e50a6970194097f98b85e1ca03070786c177567ddaf29e9c27e142ed524c815932a852b941e1deaeb75f WHIRLPOOL 6495e6c073e289a454d4fb210ea48c73ca8714dbba937d67f5907b69779509bfbf2a0aa66a37051d0cb169eb66a1c279a0d84f13094aff0f98f442afe06a44a7
-EBUILD squid-3.5.1.ebuild 7622 SHA256 f8905b18292eb4cb70924561f93c5e62b96fd334b9e0f077991fec936cbe91e7 SHA512 18c9297e9badcb97f8d404473b9239c115b214b6bf1dcc56ce9a7ca359226a01373d6c408c12415b944c72343d1a4ba0c7aa7497d30944ed6cb4544211fcf177 WHIRLPOOL 7164515065e5370345197701044590e3982a58e3aad3fb4d16ae6890588eb05894020915e829ee7e357e1b8e98a94d45d89491526526bdb1b94c4012614a3f69
 EBUILD squid-3.5.2.ebuild 7674 SHA256 dde4d53a5a7ec2c74bbfc240444528adf55dd108b1e91c4be61d95b7080ccf50 SHA512 69540f19e0d89da9a0d61ff43725d30749d990bb17b506a47d8644773ef2ee6642137b8214360bda009d3fe6d72eec22c248f289e4d5044c8379bb25935a0de4 WHIRLPOOL 687b1cf268a67580a0ed3d01de51c8f8f535290127a0e59390ce49e237c976d981cfce742726394d860a76c0dc97c2e09be58fb27c7ad7aa2a1beacae783fb35
-MISC ChangeLog 94228 SHA256 b89b0e854e4d924237612378f107b8f305a09fbbbaaf6cb4f602d704c69c2c71 SHA512 395cba8f8d0b18ac2e5e23efdd6ef5153f46494d00c3e1342d15615ce3d49293b44c240c84e3f6d879b921a12afa879fd2f7de0272be0360281b0d9477ad3526 WHIRLPOOL 5d40eaf58433c1f7f0a56f5bb68e4fd085714abe4a5339d45fe86d305a68ebe6f39f62a85b3e086fc390945722dbc4e2daa1b9b502faeb07e177862b7582a913
+MISC ChangeLog 94413 SHA256 0e884b924b7602ad3528dc1cbcac8ca6595472f56919be7e550d8734b078cfab SHA512 0203ec6a1b51045fe398e348283f82797d8fe9f13ab4ecb427e83a0ebc913f9dcaa18ee852b2cdf7991bb2705c160e2778ba2144d0fa3ac33e1aaf2c1ee880b7 WHIRLPOOL f8a08e8d985229a462a99a489bb13b2d0bac8af495c48bfbb5e91b47b019262a9ba85b47f82025d73502378aef368429a3d1b394dd1f1ac25e697362aa6274d8
 MISC metadata.xml 1545 SHA256 72b1cd3b3476500f50f936459a522eca2fabcad046cc2647662bf18b75d57edf SHA512 20c78e621a6a58697108ae3e0a543a3ead301ccb50ba54266fa9775ef66fc24590ccc7a24d20883af656b8a295fac26527c65d236d4d46ae0e0df0c2d15c993d WHIRLPOOL 90a2470ab97b9d56e0b73410741194f30b1bed09f99ab71940ded398d3796ff8d87250ccfe419c544b2e85cebd8706d0c4beed926870f290694074c34317be90
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU7FkcAAoJELp701BxlEWffzgQAKZxBhbA0luOwHCdmV/h+z6S
-72hMlQ7BaPTThIRFUln9/CzhVL3pS8CIBfrwPiCd0rUPJxCvera/g6KEcFN/Fv3q
-XgSUXBwch5rU3WSE+FftpThWAUzijhl/fUs8LmODHD893tUT/oUCTQf2hYqFKYzu
-PPBGgqIo3M0yoQvQB1H/+tc8SWDu5fhYs6fwSOqx7YEZ2hqL62jjjAWn0LSx5vzl
-b9IjpGu1xx+4hU8LnSSDOjLCA1GGs6SYTOaD3Ow0ls65gCXx1eXvY7l1bf0Y+6Fx
-q7roJ4i6gvsyHxZMffWGFV9y9N+ZU0MfTIo3IVSH1HQWpifwVgUMBsqT/qKHFpmU
-s0xFZvsNOucrcsXu7bs7mzzwVu3uSKasOzXpl5zpfzbtwEa/ZELCyJIyOq538MbR
-pnd3BNgDplx/3TfRVTzKnEQC98DMlVCtUexq7G1pSVbkWdeYRgx6lqWyt6ighJ8m
-eg3BgrmEAfFVEvRD/ULN7/iK80pRXVaemcgzpx/KOF58qE0hynkz/T4lJMsVzxaC
-dsoZyT2QV0uzbSew9JKIOfD606WEK4cJVMxRaDNwsFBeHb8UnxD0UP83jqJQm6mZ
-9MRXGRw7llyqhheH1Rc7OviBvMNNCgRVM6nPafX3Bg1xokMIKJyYARm97ueTFhbc
-a6+Bf+c9CVQ31zFzHmgv
-=5FEP
+iQJ8BAEBCABmBQJU7Z/yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsffEEP/REzBVHJqyiweOzTGdeoIBmO
+uS6tjTipT3BSR2ltvmvgR/4s/cH775hA2hKkSMDtPhLYqJWOs+Qd88rpaWAPJB7L
+RIbL1usLbcs8PoBZwMti4qbS2Mp9Fp/04t/q+YeJwnUGQfVjQTKtMwo2KuNWSNY7
+HOizdJ5paFfYIB5agRaRjg9LnXQRzo2zPyC0rYTI7axL4SR5voEGnmoT9SlzID4Z
++TsZXLGuhPgxHFb046vOvHyExSocwps7bXvnxibtqVJ8jyGavkihQnL52n3WVwWp
+S4MhS+yR0Hw2q8+zSGiGx7vmKwaOxR4F9oQYY9qtWa4Me85XnI4JJ+H5NzBo5FPb
+4e2p2fTXsZwQkFQ3ZIBRlSZQ8i2sUEmkvhRRHHwkX3jraa5zgx7/8ntdBF3gz4lA
+/qvngJMKj+RoDKvV0P0ZWLhmRdksiHpBX54YtzzXMw+fnogIcEAU9kg+x5dPn+Aq
+F6bZeRw3FVo9SvCkxopz/wli8391SFDYAWdLsNewUSwWs3BiW1TTdtGbcp3Pu8No
+PnN0rU4n8MQKi1MV+hRnGb21JnoR8bTis1kadF7do8onDug+Kqie3NAEbe4eHr/h
+e5Vcx96bLEG0tYeYaSC0O3rju1LUXJu5KPZOTDldq12MtYl99ivy5kXj2qRtZ/Ce
+qDwDgDmeUlb8iP4tE+0y
+=6SsW
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-12683_12681.patch b/net-proxy/squid/files/squid-12683_12681.patch
deleted file mode 100644
index 27847a350289..000000000000
--- a/net-proxy/squid/files/squid-12683_12681.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-=== modified file 'src/snmp_core.cc'
---- src/snmp_core.cc	2012-10-16 23:40:01 +0000
-+++ src/snmp_core.cc	2014-09-15 04:59:19 +0000
-@@ -362,7 +362,7 @@
- void
- snmpHandleUdp(int sock, void *not_used)
- {
--    LOCAL_ARRAY(char, buf, SNMP_REQUEST_SIZE);
-+    static char buf[SNMP_REQUEST_SIZE];
-     Ip::Address from;
-     SnmpRequest *snmp_rq;
-     int len;
-@@ -371,16 +371,11 @@
- 
-     Comm::SetSelect(sock, COMM_SELECT_READ, snmpHandleUdp, NULL, 0);
- 
--    memset(buf, '\0', SNMP_REQUEST_SIZE);
-+    memset(buf, '\0', sizeof(buf));
- 
--    len = comm_udp_recvfrom(sock,
--                            buf,
--                            SNMP_REQUEST_SIZE,
--                            0,
--                            from);
-+    len = comm_udp_recvfrom(sock, buf, sizeof(buf)-1, 0, from);
- 
-     if (len > 0) {
--        buf[len] = '\0';
-         debugs(49, 3, "snmpHandleUdp: FD " << sock << ": received " << len << " bytes from " << from << ".");
- 
-         snmp_rq = (SnmpRequest *)xcalloc(1, sizeof(SnmpRequest));
-
-=== modified file 'src/icmp/Icmp4.cc'
---- src/icmp/Icmp4.cc	2013-01-09 00:19:44 +0000
-+++ src/icmp/Icmp4.cc	2014-09-15 05:07:44 +0000
-@@ -41,26 +41,38 @@
- #include "IcmpPinger.h"
- #include "Debug.h"
- 
--const char *icmpPktStr[] = {
--    "Echo Reply",
--    "ICMP 1",
--    "ICMP 2",
--    "Destination Unreachable",
--    "Source Quench",
--    "Redirect",
--    "ICMP 6",
--    "ICMP 7",
--    "Echo",
--    "ICMP 9",
--    "ICMP 10",
--    "Time Exceeded",
--    "Parameter Problem",
--    "Timestamp",
--    "Timestamp Reply",
--    "Info Request",
--    "Info Reply",
--    "Out of Range Type"
--};
-+static const char *
-+IcmpPacketType(uint8_t v)
-+{
-+    static const char *icmpPktStr[] = {
-+        "Echo Reply",
-+        "ICMP 1",
-+        "ICMP 2",
-+        "Destination Unreachable",
-+        "Source Quench",
-+        "Redirect",
-+        "ICMP 6",
-+        "ICMP 7",
-+        "Echo",
-+        "ICMP 9",
-+        "ICMP 10",
-+        "Time Exceeded",
-+        "Parameter Problem",
-+        "Timestamp",
-+        "Timestamp Reply",
-+        "Info Request",
-+        "Info Reply",
-+        "Out of Range Type"
-+    };
-+
-+    if (v > 17) {
-+        static char buf[50];
-+        snprintf(buf, sizeof(buf), "ICMP %u (invalid)", v);
-+        return buf;
-+    }
-+
-+    return icmpPktStr[v];
-+}
- 
- Icmp4::Icmp4() : Icmp()
- {
-@@ -187,6 +199,12 @@
-                  from->ai_addr,
-                  &from->ai_addrlen);
- 
-+    if (n <= 0) {
-+        debugs(42, DBG_CRITICAL, HERE << "Error when calling recvfrom() on ICMP socket.");
-+        Ip::Address::FreeAddrInfo(from);
-+        return;
-+    }
-+
-     preply.from = *from;
- 
- #if GETTIMEOFDAY_NO_TZP
-@@ -243,9 +261,15 @@
- 
-     preply.psize = n - iphdrlen - (sizeof(icmpEchoData) - MAX_PKT4_SZ);
- 
-+    if (preply.psize < 0) {
-+        debugs(42, DBG_CRITICAL, HERE << "Malformed ICMP packet.");
-+        Ip::Address::FreeAddrInfo(from);
-+        return;
-+    }
-+
-     control.SendResult(preply, (sizeof(pingerReplyData) - MAX_PKT4_SZ + preply.psize) );
- 
--    Log(preply.from, icmp->icmp_type, icmpPktStr[icmp->icmp_type], preply.rtt, preply.hops);
-+    Log(preply.from, icmp->icmp_type, IcmpPacketType(icmp->icmp_type), preply.rtt, preply.hops);
-     preply.from.FreeAddrInfo(from);
- }
- 
-
-=== modified file 'src/icmp/Icmp6.cc'
---- src/icmp/Icmp6.cc	2013-01-09 00:19:44 +0000
-+++ src/icmp/Icmp6.cc	2014-09-15 05:07:44 +0000
-@@ -50,57 +50,61 @@
- 
- // Icmp6 OP-Codes
- // see http://www.iana.org/assignments/icmpv6-parameters
--// NP: LowPktStr is for codes 0-127
--static const char *icmp6LowPktStr[] = {
--    "ICMP 0",			// 0
--    "Destination Unreachable",	// 1 - RFC2463
--    "Packet Too Big", 		// 2 - RFC2463
--    "Time Exceeded",		// 3 - RFC2463
--    "Parameter Problem",		// 4 - RFC2463
--    "ICMP 5",			// 5
--    "ICMP 6",			// 6
--    "ICMP 7",			// 7
--    "ICMP 8",			// 8
--    "ICMP 9",			// 9
--    "ICMP 10"			// 10
--};
--
--// NP: HighPktStr is for codes 128-255
--static const char *icmp6HighPktStr[] = {
--    "Echo Request",					// 128 - RFC2463
--    "Echo Reply",					// 129 - RFC2463
--    "Multicast Listener Query",			// 130 - RFC2710
--    "Multicast Listener Report",			// 131 - RFC2710
--    "Multicast Listener Done",			// 132 - RFC2710
--    "Router Solicitation",				// 133 - RFC4861
--    "Router Advertisement",				// 134 - RFC4861
--    "Neighbor Solicitation",			// 135 - RFC4861
--    "Neighbor Advertisement",			// 136 - RFC4861
--    "Redirect Message",				// 137 - RFC4861
--    "Router Renumbering",				// 138 - Crawford
--    "ICMP Node Information Query",			// 139 - RFC4620
--    "ICMP Node Information Response",		// 140 - RFC4620
--    "Inverse Neighbor Discovery Solicitation",	// 141 - RFC3122
--    "Inverse Neighbor Discovery Advertisement",	// 142 - RFC3122
--    "Version 2 Multicast Listener Report",		// 143 - RFC3810
--    "Home Agent Address Discovery Request",		// 144 - RFC3775
--    "Home Agent Address Discovery Reply",		// 145 - RFC3775
--    "Mobile Prefix Solicitation",			// 146 - RFC3775
--    "Mobile Prefix Advertisement",			// 147 - RFC3775
--    "Certification Path Solicitation",		// 148 - RFC3971
--    "Certification Path Advertisement",		// 149 - RFC3971
--    "ICMP Experimental (150)",			// 150 - RFC4065
--    "Multicast Router Advertisement",		// 151 - RFC4286
--    "Multicast Router Solicitation",		// 152 - RFC4286
--    "Multicast Router Termination",			// 153 - [RFC4286]
--    "ICMP 154",
--    "ICMP 155",
--    "ICMP 156",
--    "ICMP 157",
--    "ICMP 158",
--    "ICMP 159",
--    "ICMP 160"
--};
-+static const char *
-+IcmpPacketType(uint8_t v)
-+{
-+    // NP: LowPktStr is for codes 0-127
-+    static const char *icmp6LowPktStr[] = {
-+        "ICMPv6 0",			// 0
-+        "Destination Unreachable",	// 1 - RFC2463
-+        "Packet Too Big", 		// 2 - RFC2463
-+        "Time Exceeded",		// 3 - RFC2463
-+        "Parameter Problem",		// 4 - RFC2463
-+    };
-+
-+    // low codes 1-4 registered
-+    if (0 < v && v < 5)
-+        return icmp6LowPktStr[(int)(v&0x7f)];
-+
-+    // NP: HighPktStr is for codes 128-255
-+    static const char *icmp6HighPktStr[] = {
-+        "Echo Request",					// 128 - RFC2463
-+        "Echo Reply",					// 129 - RFC2463
-+        "Multicast Listener Query",			// 130 - RFC2710
-+        "Multicast Listener Report",			// 131 - RFC2710
-+        "Multicast Listener Done",			// 132 - RFC2710
-+        "Router Solicitation",				// 133 - RFC4861
-+        "Router Advertisement",				// 134 - RFC4861
-+        "Neighbor Solicitation",			// 135 - RFC4861
-+        "Neighbor Advertisement",			// 136 - RFC4861
-+        "Redirect Message",				// 137 - RFC4861
-+        "Router Renumbering",				// 138 - Crawford
-+        "ICMP Node Information Query",			// 139 - RFC4620
-+        "ICMP Node Information Response",		// 140 - RFC4620
-+        "Inverse Neighbor Discovery Solicitation",	// 141 - RFC3122
-+        "Inverse Neighbor Discovery Advertisement",	// 142 - RFC3122
-+        "Version 2 Multicast Listener Report",		// 143 - RFC3810
-+        "Home Agent Address Discovery Request",		// 144 - RFC3775
-+        "Home Agent Address Discovery Reply",		// 145 - RFC3775
-+        "Mobile Prefix Solicitation",			// 146 - RFC3775
-+        "Mobile Prefix Advertisement",			// 147 - RFC3775
-+        "Certification Path Solicitation",		// 148 - RFC3971
-+        "Certification Path Advertisement",		// 149 - RFC3971
-+        "ICMP Experimental (150)",			// 150 - RFC4065
-+        "Multicast Router Advertisement",		// 151 - RFC4286
-+        "Multicast Router Solicitation",		// 152 - RFC4286
-+        "Multicast Router Termination",			// 153 - [RFC4286]
-+    };
-+
-+    // high codes 127-153 registered
-+    if (127 < v && v < 154)
-+        return icmp6HighPktStr[(int)(v&0x7f)];
-+
-+    // give all others a generic display
-+    static char buf[50];
-+    snprintf(buf, sizeof(buf), "ICMPv6 %u", v);
-+    return buf;
-+}
- 
- Icmp6::Icmp6() : Icmp()
- {
-@@ -236,6 +240,12 @@
-                  from->ai_addr,
-                  &from->ai_addrlen);
- 
-+    if (n <= 0) {
-+        debugs(42, DBG_CRITICAL, HERE << "Error when calling recvfrom() on ICMPv6 socket.");
-+        Ip::Address::FreeAddrInfo(from);
-+        return;
-+    }
-+
-     preply.from = *from;
- 
- #if GETTIMEOFDAY_NO_TZP
-@@ -291,8 +301,7 @@
- 
-         default:
-             debugs(42, 8, HERE << preply.from << " said: " << icmp6header->icmp6_type << "/" << (int)icmp6header->icmp6_code << " " <<
--                   ( icmp6header->icmp6_type&0x80 ? icmp6HighPktStr[(int)(icmp6header->icmp6_type&0x7f)] : icmp6LowPktStr[(int)(icmp6header->icmp6_type&0x7f)] )
--                  );
-+                   IcmpPacketType(icmp6header->icmp6_type));
-         }
-         preply.from.FreeAddrInfo(from);
-         return;
-@@ -331,7 +340,7 @@
- 
-     Log(preply.from,
-         icmp6header->icmp6_type,
--        ( icmp6header->icmp6_type&0x80 ? icmp6HighPktStr[(int)(icmp6header->icmp6_type&0x7f)] : icmp6LowPktStr[(int)(icmp6header->icmp6_type&0x7f)] ),
-+        IcmpPacketType(icmp6header->icmp6_type),
-         preply.rtt,
-         preply.hops);
- 
-
diff --git a/net-proxy/squid/squid-3.3.13-r1.ebuild b/net-proxy/squid/squid-3.3.13-r1.ebuild
deleted file mode 100644
index 9c7fdb4d9270..000000000000
--- a/net-proxy/squid/squid-3.3.13-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.13-r1.ebuild,v 1.14 2015/02/02 07:34:37 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.xz"
-
-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:0.2 )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	<=sys-devel/libtool-2.4.2-r1
-	dev-lang/perl"
-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 )
-	selinux? ( sec-policy/selinux-squid )
-	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"
-	epatch "${FILESDIR}/${PN}-12683_12681.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
-
-	epatch_user
-
-	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 myconf
-	if use kerberos ; then
-		negotiate_modules="kerberos,wrapper"
-		myconf="--with-krb5-config=yes"
-	else
-		negotiate_modules="none"
-		myconf="--with-krb5-config=no"
-	fi
-
-	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"
-
-	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} \
-		${myconf}
-}
-
-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*
-	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-	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
-	newinitd "${FILESDIR}/squid.initd-r4" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /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.4.10.ebuild b/net-proxy/squid/squid-3.4.10.ebuild
deleted file mode 100644
index 1c4ca87b9d0c..000000000000
--- a/net-proxy/squid/squid-3.4.10.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.10.ebuild,v 1.1 2014/12/10 15:47:16 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.4/${P}.tar.xz"
-
-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 esi icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	+htcp +wccp +wccpv2 \
-	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 dev-libs/nettle )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:0.2 )
-	esi? ( dev-libs/expat dev-libs/libxml2 )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
-	ecap? ( virtual/pkgconfig )
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	selinux? ( sec-policy/selinux-squid )
-	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:/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 || die
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	epatch_user
-
-	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 myconf
-	if use kerberos ; then
-		negotiate_modules="kerberos,wrapper"
-		myconf="--with-krb5-config=yes"
-	else
-		negotiate_modules="none"
-		myconf="--with-krb5-config=no"
-	fi
-
-	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"
-
-	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 \
-		--with-large-files \
-		--disable-strict-error-checking \
-		--disable-arch-native \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_with ssl nettle) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		$(use_enable esi) \
-		$(use_enable htcp) \
-		$(use_enable wccp) \
-		$(use_enable wccpv2) \
-		${transparent} \
-		${myconf}
-}
-
-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
-
-	# cleanup
-	rm -f "${D}"/usr/bin/Run*
-	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-	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
-	newinitd "${FILESDIR}/squid.initd-r4" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /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 4 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.4.11.ebuild b/net-proxy/squid/squid-3.4.11.ebuild
deleted file mode 100644
index b4814fb46210..000000000000
--- a/net-proxy/squid/squid-3.4.11.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.11.ebuild,v 1.2 2015/02/02 07:36:58 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.4/${P}.tar.xz"
-
-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 esi icap-client ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	+htcp +wccp +wccpv2 \
-	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 dev-libs/nettle )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:0.2 )
-	esi? ( dev-libs/expat dev-libs/libxml2 )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl
-	dev-libs/libltdl"
-DEPEND="${COMMON_DEPEND}
-	ecap? ( virtual/pkgconfig )
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	selinux? ( sec-policy/selinux-squid )
-	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:/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 || die
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	epatch_user
-
-	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 myconf
-	if use kerberos ; then
-		negotiate_modules="kerberos,wrapper"
-		myconf="--with-krb5-config=yes"
-	else
-		negotiate_modules="none"
-		myconf="--with-krb5-config=no"
-	fi
-
-	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"
-
-	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 \
-		--with-large-files \
-		--disable-strict-error-checking \
-		--disable-arch-native \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_with ssl nettle) \
-		$(use_enable ssl-crtd) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		$(use_enable esi) \
-		$(use_enable htcp) \
-		$(use_enable wccp) \
-		$(use_enable wccpv2) \
-		${transparent} \
-		${myconf}
-}
-
-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
-
-	# cleanup
-	rm -f "${D}"/usr/bin/Run*
-	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-	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
-	newinitd "${FILESDIR}/squid.initd-r4" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /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 4 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
-		echo
-	fi
-}
diff --git a/net-proxy/squid/squid-3.5.1.ebuild b/net-proxy/squid/squid-3.5.1.ebuild
deleted file mode 100644
index 1e0a819d9522..000000000000
--- a/net-proxy/squid/squid-3.5.1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.1.ebuild,v 1.3 2015/02/02 07:36:58 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.5/${P}.tar.xz"
-
-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 esi ssl-crtd \
-	mysql postgres sqlite \
-	qos tproxy \
-	+htcp +wccp +wccpv2 \
-	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 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:1 )
-	esi? ( dev-libs/expat dev-libs/libxml2 )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl
-	dev-libs/libltdl"
-DEPEND="${COMMON_DEPEND}
-	ecap? ( virtual/pkgconfig )
-	sys-apps/ed
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	selinux? ( sec-policy/selinux-squid )
-	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:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		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/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 || die
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="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"
-	local myconf="--without-mit-krb5 --without-heimdal-krb5"
-	if use kerberos ; then
-		negotiate_modules="kerberos,wrapper"
-		if has_version app-crypt/heimdal ; then
-			myconf="--without-mit-krb5 --with-heimdal-krb5"
-		else
-			myconf="--with-mit-krb5 --without-heimdal-krb5"
-		fi
-	fi
-
-	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"
-
-	local storeio_modules="aufs,diskd,rock,ufs"
-
-	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-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 \
-		--with-large-files \
-		--disable-strict-error-checking \
-		--disable-arch-native \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_with ssl openssl) \
-		$(use_with ssl nettle) \
-		$(use_with ssl gnutls) \
-		$(use_enable ssl-crtd) \
-		$(use_enable ecap) \
-		$(use_enable esi) \
-		$(use_enable htcp) \
-		$(use_enable wccp) \
-		$(use_enable wccpv2) \
-		${transparent} \
-		${myconf}
-}
-
-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
-
-	# cleanup
-	rm -f "${D}"/usr/bin/Run*
-	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-	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
-	newinitd "${FILESDIR}/squid.initd-r4" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /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 5 ]]; then
-		elog "Please read the release notes at:"
-		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
-		echo
-	fi
-}