Remove old

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

10 files changed, 29 insertions, 1305 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index a92719a1a921..e1aeaf5e3c36 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.371 2012/12/29 08:52:38 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.372 2013/01/04 08:22:07 eras Exp $
+
+  04 Jan 2013; Eray Aslan <eras@gentoo.org> -files/squid-2-heimdal.patch,
+  -files/squid-2.7.9-gentoo.patch, -files/squid-3.1.18-ecap.patch,
+  -files/squid.initd, -files/squid.initd-logrotate, -squid-3.1.19.ebuild,
+  -squid-3.1.21.ebuild, -squid-3.2.3.ebuild:
+  Remove old
 
   29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> squid-3.1.22.ebuild:
   Stable for alpha, wrt bug #447596
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index e3b47876e6da..d96505c0525c 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,27 +1,36 @@
-AUX squid-2-heimdal.patch 776 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25 SHA512 78ac4e930dbf4296036fff9022572e455ed7999eddfcc0b13d34da74bc1c994665fbe30f2e3322f1efa31834a555ed1dce2b3327b4d97bfd03363ae03164d410 WHIRLPOOL f8a54ea5f52968958607df7ebd467b591fbc9189de5b03d1f871b534980858348929b25f3fc3a2fb2ec968655a73e9323f2fe79d2b0b43558669714edba7996b
-AUX squid-2.7.9-gentoo.patch 13118 SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11 SHA512 358fb2e28fc7eb9cee573c05e1becee9ad9ce0cacde106f0809ca2e12ec6ca0a1d68eab81a34879d2ca7b05adcacb33502369266b3c9eed249f2506e0c55492d WHIRLPOOL b8c62251f4d1e54d50b301ac807e9bf08d6c777432795820f993b2a4f29be7491b60c13b3200a16f79280b8e2e410c2ca34a0a5820da8493fdcceea0e3b82e59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7
-AUX squid-3.1.18-ecap.patch 1798 SHA256 576866c7fefa8c927ea029ecdcf90851ffa24fa528f2894d73667bd6a508ce63 SHA512 d5957f1898a0cfb072b19f2bf2e3ca0c6fdf9d8421ce907df173ac2948dede62c1cd738614b79c004c36dd1b7c1f7ef4a74d2962f9ab52c497d1d73ca16284cc WHIRLPOOL f58a4fdee3af2921908fd17621977b311fc4d3a25e04857a79971811ccda337a21ff5aa8f6e9d80588120d103356c988deb8c71250be7752d1c6e930da76c609
 AUX squid-3.2.1-gentoo.patch 4418 SHA256 41da185c1af04590525fc9144c14edd160522b878efc2e62e8a992a001ad38e0 SHA512 08ba6aac7de61aaae9a96c42801dbb8e414a2b8ec7bccd80afb1973f7c9949dacee4011e54d050c7ae46a06d2914ca8a42629af5707c6810b1547e3b66ccd5c0 WHIRLPOOL 2f8ba78840e46a3b8e780b653d8084f9c0e8b4d0793f4b06cb7faf9c6ae32b193de923b411c394278747ad9574cbf317f72f97467fbca386db4c4f1bd0f1ba50
 AUX squid.confd 540 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec SHA512 db9a9f2d476df279e1f2c9ec6bdec42d0c4cd9117c78e2ce5876855bd91add5c01bf06d34456e9146fe70374b118ae20a8e75bf07254aa335dd3190e11c72d23 WHIRLPOOL 55863f771bb4ffc39dd809e5233bbfce994a8e4345f84d264c427b7d5d571c998b0011b71f878df2ff4d7037da250e62296f9c962a8118532e25af9297471995
 AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 WHIRLPOOL 029c94d4e4826ee612c7dc12acc088e3100c9d1737baebb74b25b6e7ac2ba78d0bab9f744c12b5de4113c9727892c9a30dd17067409ac8da62afeee552de391e
-AUX squid.initd 3331 SHA256 7a81926479941054358bce650c8c9d3f070a7b40c886e5ed3a337668997bc0ab SHA512 6b5157ed3f4db52db9064a5cfcf5ce3429caf38cefbe61955154f2b6371ade5916b278b61ed01ced51cbd11e283553f7c4bde09e97c261a75a6a1da9bb1cfeb1 WHIRLPOOL bc549677659f88280e9f424deb6cd84de9d564707b949e59d425680f2f2565c7579c6a27fe09794887eef8498d5522efcb2035b81e3bfd48e2f34073438cadd4
-AUX squid.initd-logrotate 3179 SHA256 3edb51b43218b8bdf5eee0f58f03d8a0fe5c470db1e81992c036649b1b1d5f85 SHA512 a63eaa48fb41dfaa280eae7655eec3f12ab6f9f0ebd9575ac85b1d243a5b21da0df796076a6264b2a1818c700aa50d61478dfcde46302bd32ed8d9be1ccf8299 WHIRLPOOL 27968fd84b67442b24e98d774a6f4038267e614203d42705ae85866c777ed1c71361e287bf8e4cdf0ca6672601b5bdf6817cf68470fdd28de7fb7137a842e98e
 AUX squid.initd-logrotate-r1 3167 SHA256 cd245c5561a9ded59d71f1e73b3c97a56e4253325dec7054435b4d07d222e9a0 SHA512 818d875560f0b85920353af9ee2337c1109d14c34d623583708a44a53169889b864a281d03aa64ef1809b11852a619eca086b632aec8360750fa8ae8d7f22e99 WHIRLPOOL c15bf7f705f1c0f9d6a714ab97c73a2793d8a0e9a15cb2cc17e717f4729ea3cd892fd8969c5ba3afeff41586f424ded077aaef3958a64a2c14584a905061f4b7
 AUX squid.initd-logrotate-r2 3039 SHA256 584cb997965564cda7d2c31f320ef9296bb24f5182f1e85da023b8f959451810 SHA512 f69cfc7e461afde16b83d8470651b9fa2828bd12354612a758beee05820b6cd03153bc0c9a6efde5042a641e80109fa44db46fb8741e272b79d418efbd708547 WHIRLPOOL b9df15c0a42a457e81eaecb2abf61bbba1342ccd9aa1199186ca53692bc2e25369d619007e69c75ea6ff241024deb12e7d7c821cc93b1e5251d32ed91f788195
 AUX squid.initd-r1 3319 SHA256 f38e04ba1e295e9bbb537e353823c4bd738d206f4790d024e65aacfefbfe7abb SHA512 fc60c330dfebc2ff9f964b6475d8d00fcf69211384b605b68fef95daf5adc23c0d9fe1b72d858923449f7f024e8520bb7aa17d1ffa55e40f8de2726aa234125a WHIRLPOOL 27a43a425b67fb00a654b9bb71062aac63c7c4885bbd9493341043bb7147f8f7ac89ab79e015008f9da10b0a68f00b038d1ef932f7e0c350dfc9b3fc0fd9033e
 AUX squid.initd-r2 3191 SHA256 b6f91362925869151ecbea7bfa654c1bdec489170a0df775c9ac6248e9dd89dd SHA512 81e2c1fc697cce91ff7dd5a03711a8dc9ed8f51fa91daf9223e36474cbadc07772bfcea58dc49dc2b99167e2637eae5390fa3d042c319cf9f8eacc2f79f4cf4a WHIRLPOOL 469a1ec1c8fcd549c43349a174878a100ba89cb0a8e245373eaf33c9e1656473f8fa15149386fcde3a2ad5299f5491381e285483d4c0d4b5838b391ef39f3f4b
 AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
-DIST squid-3.1.19.tar.gz 3403110 SHA256 1a2ebfd832364ada4793532dcc59fb79588ee3819cb80b77d8f53858f0166e34 SHA512 1705533cdcc0e8dce074e263f3952ffd6d44f68dbc4a8c8422ca263f4a3ef25db337bb226dce697333bada1e3a58fccb693b6193b5caa69ab3b6b8d1616822d3 WHIRLPOOL 4d6ff3c4bd4be2bc2e09ec8d17ea39b8a0d273159a7205dab488e271cf807a93443bf6f2acc103d0de6459afa9e7033a75db8cce01ad7bf25da69e27726412d3
-DIST squid-3.1.21.tar.gz 3488540 SHA256 04ad5693bc3a018d63cb4e4ac4822020def77d50ec40581e5c298fa14525acf4 SHA512 e6ec25b07be94a867f8cb729d015935bec84f1e8762612b165ea57e6fb7998b7a9a7976d7f76f814190802aece28021177a24ad0c5f18beba99fef6a34ebf0a7 WHIRLPOOL 46670e177e2f0fcd5a4c20948332ba8a5547026151335df19154dcddeff127d8b880563ac10c3b33ab1f151f2d826be0cb4ad58f7a68b0bb9c3a96450a57dcf9
 DIST squid-3.1.22.tar.gz 3489587 SHA256 59764791cc030779f764fa077f2668bd0c8ebd25ce2f72c6526728de3c82369f SHA512 4ba31205397679d901fa702bad4f177f7ab1f4e1f7714c8be00318c3b2235e46122bf62ec5bc82ad081484869e4d1ee86d14eb060a1cd1240cd2bbac634426b8 WHIRLPOOL 7788205d852c71e2b489802db2fb9a82ccfdb12a4133cf157e96b2d1932554e61e314365ecefa02832670641f05e77ac5fb063518efd560a9f3ccd8a18c32004
-DIST squid-3.2.3.tar.gz 4103625 SHA256 ef9ccdaa67c07a18277cb6b621d5f4103944f2d6cef9d5ea0affaae69d821700 SHA512 59ec2f64512b0f3e2c4ff9a940712baee929c6f36730860e299685cd88e05fbbf0f7edb3be1f1207994cd5717a0a473c1e545c1720b2afefe9404d33936f0d15 WHIRLPOOL 133af88e2cbc42798f3e72c1d77329b824b4bdc8e09b76e9df607486d0bc4ba60c4e7b24c5842fd00230785de88f6bf47838645ad49fa5e0220add347fea1d6a
 DIST squid-3.2.5.tar.gz 4107649 SHA256 331a507fec11c89b5ccfabaf9eedd6c208eaa0a64b0aba4c2477f68443b35b69 SHA512 0107b38d49423f354d2bea7cedd3f8114d56ac72175a1235d72b58f9b1735c0acfad76fae131cdb8b912e407e761d445ba8b8ddea088387baed470913c13ccc2 WHIRLPOOL c45202e9b9342f74f864c362b8af7dc2cd720ec8eacd424ef8e7e48ebdc32ebe6b30b6534c277256bc86cd51e073f824bf8395290f05b2451aafb307c1cf2147
-EBUILD squid-3.1.19.ebuild 6663 SHA256 94e8e43447f592df50cd1b462fb87edd8dcbfa1543850e63d6588307108303cc SHA512 5e615da6fc2e0f27f26109904b70e8847fb99b348d4e1f04fd861478f5ce8ed5220333a55f6317eb9f2172dc120bdd6b1956f80d84997e9f3e2437b0f3fafcad WHIRLPOOL 4ebfc0ea9d7aaaef0b9c3f0a8a300470f07828ad90b9060c36b2189b16c2f3b0cc45f6165b960c2301eae2a2bb05d4877eae364590755502267f9f24ea31a9c0
-EBUILD squid-3.1.21.ebuild 6641 SHA256 494236982f99275d67fd1e1241bd1dc42dfd90d65b4888f09af09bc7d3553399 SHA512 d1838d8fac7799310219966ef0515d8b477dcf7ac611bffcb3cc68593cf33350f45bc725dd33f33b4d37834da06ea0dff1d8bd2304315e8b96b8768d0406dc43 WHIRLPOOL 1668506f0fac06c1e03ba1771a7ded3322c430be5dc000be06e950ae5b32dbd9ca722e18c3cfb40749d0109f0528081615b9ac784fd2eef68155f7f0d128a070
 EBUILD squid-3.1.22.ebuild 6638 SHA256 c0a1e6cc8939550d85f44c56f70cb3ff0bf74797a8bb3111441ab275f28e0ff9 SHA512 312f1ad13015ffdbdfbc6062806585b001215bb7905d233d0ae0146f2289750b0585ea13b7331b96082c3cb1e6b67833ed5ad899192c87c16e88cd9351bc5fb4 WHIRLPOOL dc5ad35e6bedd6fe147f0e2857739762a3d0ab578a43556ab04ee05c9fcdaa8b92c2e86e10975e33123ef8ec1e49472a1ca38853106bfe4e9b52fdaffd0e1895
-EBUILD squid-3.2.3.ebuild 7564 SHA256 45c6c7ef0a743abcba1f25575223855912504690e15de7389ac9f4b18e95385b SHA512 ad0a6cbedecd6301982b3659070a902bcf44166b24410c30e7f52b8d887253aea5cf9ed272bebf2ef68947ff9500f37a0ea1e80bbf18201582b650db85d92531 WHIRLPOOL 42c20338bb629f143fd8ef8da0f842350111bfc7f9815d669057213986c044a82771e6790eca680cc288d0de549213f719b7336e849c5e855a8aac9e8af73792
 EBUILD squid-3.2.5.ebuild 7561 SHA256 677e9d155456005e2c9ce45f916201a65a65e9ae4e3909949e118c178521c1b6 SHA512 88f01b615b90712d8d344ca8c603f1ebd7a2d434f62165e96339f4b138cc6426f0acd1002a1d082d74b572f051afd52a8d037e790a7a1bdf906491f201b42af3 WHIRLPOOL 68e0772473f2e4c101aafd238bc48cfdaa517b410be2f6a5fd37f0e517d2f1f67d397a8da20531f4a7b79bde65d66178098d78a8a9a374e02fd035841d3d8a8b
-MISC ChangeLog 75357 SHA256 183afbef9123ab30937199c937ff458633f16335192daa1d9aff896aa35b0299 SHA512 8ea26859762476e023f4f6f1ac071eb09b0c657b17cfc7a2b0f10a239093c1084b590b92ebef303de5fdaec5e33f5c1e48c9257249f9e2fd19249c29120dae68 WHIRLPOOL b696dcf6a71700d3bfd8be9c94a75ed9a56b5a615b29e38403bd81f0718a38d634099c0dd9bdbcab22b3426cc1e3ab7182b7b1cc56b36ae441bd9e580531043a
+MISC ChangeLog 75632 SHA256 b32a76f030a24a7c97868e10e6f4e91768a7aecd5a45ee0b8812861a95bf65a4 SHA512 4b413ecbf2a8647b27f623a278b29c6a0fd306f249ce41db7980cdbbbaa75134173d32965557cab7553d9dbda5c2c04dac90e19a88c97b3f9b48ceca50534200 WHIRLPOOL 21b6e9f1f136afe12be954e263e448f77aab67751fa49425e2eb95897cd10d8f15e3a55d2bf39a4fe06f6ea5060f43bdf32f25e9a45c3c569f2ee30b458db95d
 MISC metadata.xml 1335 SHA256 07a1e3761c3f3f2c3524057a7321fef17742203c3ede39066e89da593e4c6265 SHA512 1876ea4e243a6a95e748cd471823191713fa5dad5fc64343e35d7cf345e504e2ab56109b9b8a1f4c0740c03770026773c825abd5a9635eea74e35aa67bcf55d3 WHIRLPOOL c0b2399f9c8f78a28753d27520c4d64e3c8aa8894e66f12162e0197e85cd9a81949e5e5868b2461ddb1d757b52a97674105820fd6e84fa4946d410e00effd965
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ5pExAAoJEHfx8XVYajsfmZIQAJTAQ0mOvf20ch5RozFvGzGw
+LfIroazZx7CQOTlRT7tsvU4Jn2LFJBggpX0u7DMYrYtqefumBhZoySoGq1Tx1Uho
+t44LnjrA3MNBK9ohdAcHqxjk0cZSovLBg0Z23M8vvlrzxkkLspwG5KhThMYhP0vP
+l3lvFP5pD64go3/SUhQZWF+dF9f2SwU83lCW9hI+wWJhNgr5xdj4lHtkkOcYxfAi
+TpJz8/9XeZOBtQtJii5uEELUHletwcHyCprXjOgqAxXTaSlzjaxdTCeId4KwzbD/
+IEzrS2OPzr59K2SqYh2uk30VfeFO1az+8Z4KfiFwGFtW5KEKX9KQ2nS5b9gKeWWh
+30cQJVexTL5L2/25XYxKLUDLFLPciReIkNv+jArSy/NAUsgEa+CwqcqqHeGYZo2A
+7RZU4XZsuHz1UU6HuUDCHUo6l8kTNpYhOC5gvcfwn9Im3KfWg7jy8jx6OUYCNyRK
+RYCr1aybhFlLmMJkYrTTvFN0Xb2nJuRdmRRwjrYuA+oaCQdje5+y3VvFBYFy3O4Z
+ce4hCtZaxTycMC6LE1sL/eSFTzvNUDW0S0kcqKBGu9mAk2XNPzT/dai1g/z2YZ92
+rFyphv/VSJd+lhWKS8IFOjfWLGEuQBjmIaw20P4PC+GDGXXaGR3u+feSoVJlGMb0
+J1OUvzqOgW1EucvTjikb
+=Rzmf
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2-heimdal.patch b/net-proxy/squid/files/squid-2-heimdal.patch
deleted file mode 100644
index 67500ae6a85d..000000000000
--- a/net-proxy/squid/files/squid-2-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2007-05-14 23:36:29.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-16 23:26:28.000000000 +0000
-@@ -18,10 +18,10 @@
- #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
- 
- # HEIMDAL
--#KERBINC = -DHEIMDAL -I/usr/include/heimdal
--#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
-+KERBINC = -DHEIMDAL -I/usr/include/heimdal
-+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
- 
- # MIT
--KERBINC = 
--KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
-+#KERBINC = 
-+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
- 
diff --git a/net-proxy/squid/files/squid-2.7.9-gentoo.patch b/net-proxy/squid/files/squid-2.7.9-gentoo.patch
deleted file mode 100644
index 8a079a568b9a..000000000000
--- a/net-proxy/squid/files/squid-2.7.9-gentoo.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-diff -Nru squid-2.7.STABLE9.orig/configure.in squid-2.7.STABLE9/configure.in
---- squid-2.7.STABLE9.orig/configure.in	2010-03-17 01:10:12.000000000 +0100
-+++ squid-2.7.STABLE9/configure.in	2010-08-07 06:48:37.000000000 +0200
-@@ -18,9 +18,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
- 
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
--	LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl 	LDFLAGS="-g"
-+dnl fi
- 
- dnl Check for GNU cc
- AC_PROG_CC
-diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE9/helpers/basic_auth/MSNT/confload.c
---- squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 21:09:48.000000000 +0200
-+++ squid-2.7.STABLE9/helpers/basic_auth/MSNT/confload.c	2010-08-07 06:48:37.000000000 +0200
-@@ -24,7 +24,7 @@
- 
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
- 
-diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 20:44:28.000000000 +0200
-+++ squid-2.7.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default	2010-08-07 06:48:37.000000000 +0200
-@@ -8,6 +8,6 @@
- server other_PDC	other_BDC	otherdomain
- 
- # Denied and allowed users. Comment these if not needed.
--#denyusers	/usr/local/squid/etc/msntauth.denyusers
--#allowusers	/usr/local/squid/etc/msntauth.allowusers
-+#denyusers	/etc/squid/msntauth.denyusers
-+#allowusers	/etc/squid/msntauth.allowusers
- 
-diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE9/helpers/basic_auth/SMB/Makefile.am
---- squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 18:56:26.000000000 +0200
-+++ squid-2.7.STABLE9/helpers/basic_auth/SMB/Makefile.am	2010-08-07 06:48:37.000000000 +0200
-@@ -14,7 +14,7 @@
- ## FIXME: autoconf should test for the samba path.
- 
- SMB_AUTH_HELPER	= smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE9/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 00:36:46.000000000 +0100
-+++ squid-2.7.STABLE9/helpers/basic_auth/SMB/smb_auth.sh	2010-08-07 06:48:37.000000000 +0200
-@@ -24,7 +24,7 @@
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
- 
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@
-   addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
- 
-diff -Nru squid-2.7.STABLE9.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE9/helpers/external_acl/session/squid_session.8
---- squid-2.7.STABLE9.orig/helpers/external_acl/session/squid_session.8	2007-01-06 18:28:35.000000000 +0100
-+++ squid-2.7.STABLE9/helpers/external_acl/session/squid_session.8	2010-08-07 06:48:37.000000000 +0200
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-2.7.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-2.7.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 17:07:24.000000000 +0200
-+++ squid-2.7.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8	2010-08-07 06:48:37.000000000 +0200
-@@ -27,7 +27,7 @@
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-2.7.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/do.sh
---- squid-2.7.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2007-06-25 00:23:18.000000000 +0200
-+++ squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/do.sh	2010-08-07 06:48:37.000000000 +0200
-@@ -7,7 +7,7 @@
- #
- CC=gcc
- #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
--CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
-+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
- if [ "$1" = "HEIMDAL" ]; then
-   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
-   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
-diff -Nru squid-2.7.STABLE9.orig/src/access_log.c squid-2.7.STABLE9/src/access_log.c
---- squid-2.7.STABLE9.orig/src/access_log.c	2008-03-18 03:48:43.000000000 +0100
-+++ squid-2.7.STABLE9/src/access_log.c	2010-08-07 06:48:37.000000000 +0200
-@@ -1261,7 +1261,7 @@
- 	LogfileStatus = LOG_ENABLE;
-     }
- #if HEADERS_LOG
--    headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0);
-+    headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0);
-     assert(NULL != headerslog);
- #endif
- #if FORW_VIA_DB
-diff -Nru squid-2.7.STABLE9.orig/src/cf.data.pre squid-2.7.STABLE9/src/cf.data.pre
---- squid-2.7.STABLE9.orig/src/cf.data.pre	2009-11-09 23:38:57.000000000 +0100
-+++ squid-2.7.STABLE9/src/cf.data.pre	2010-08-07 06:48:37.000000000 +0200
-@@ -678,6 +678,8 @@
- acl Safe_ports port 488		# gss-http
- acl Safe_ports port 591		# filemaker
- acl Safe_ports port 777		# multiling http
-+acl Safe_ports port 901		# SWAT
-+acl purge method PURGE
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -711,6 +713,9 @@
- # Only allow cachemgr access from localhost
- http_access allow manager localhost
- http_access deny manager
-+# Only allow purge requests from localhost
-+http_access allow purge localhost
-+http_access deny purge
- # Deny requests to unknown ports
- http_access deny !Safe_ports
- # Deny CONNECT to other than SSL ports
-@@ -728,6 +733,9 @@
- # from where browsing should be allowed
- http_access allow localnet
- 
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -3754,11 +3762,11 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies. The default is "webmaster".
-+	mail if the cache dies. The default is "root".
- DOC_END
- 
- NAME: mail_from
-@@ -3787,12 +3795,12 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: squid
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
- 	UID/GID to the user specified below.  The default is to change
--	to UID to nobody.  If you define cache_effective_user, but not
-+	to UID to squid.  If you define cache_effective_user, but not
- 	cache_effective_group, Squid sets the GID to the effective
- 	user's default group ID (taken from the password file) and
- 	supplementary group list from the from groups membership of
-@@ -4429,12 +4437,12 @@
- NAME: snmp_port
- TYPE: ushort
- LOC: Config.Port.snmp
--DEFAULT: 3401
-+DEFAULT: 0
- IFDEF: SQUID_SNMP
- DOC_START
- 	Squid can now serve statistics and status information via SNMP.
--	By default it listens to port 3401 on the machine. If you don't
--	wish to use SNMP, set this to "0".
-+	By default snmp_port is disabled. If you wish to use SNMP, 
-+	set this to "3401" (or any other number you like).
- DOC_END
- 
- NAME: snmp_access
-@@ -4505,12 +4513,12 @@
- NAME: htcp_port
- IFDEF: USE_HTCP
- TYPE: ushort
--DEFAULT: 4827
-+DEFAULT: 0
- LOC: Config.Port.htcp
- DOC_START
- 	The port number where Squid sends and receives HTCP queries to
--	and from neighbor caches.  Default is 4827.  To disable use
--	"0".
-+	and from neighbor caches.  To turn it on you want to set it to
-+	4827.  By default it is set to "0" (disabled).
- DOC_END
- 
- NAME: log_icp_queries
-@@ -5407,6 +5415,9 @@
- 	If you disable this, it will appear as
- 
- 		X-Forwarded-For: unknown
-+NOCOMMENT_START
-+forwarded_for off
-+NOCOMMENT_END
- DOC_END
- 
- NAME: cachemgr_passwd
-diff -Nru squid-2.7.STABLE9.orig/src/client_side.c squid-2.7.STABLE9/src/client_side.c
---- squid-2.7.STABLE9.orig/src/client_side.c	2010-02-14 01:46:25.000000000 +0100
-+++ squid-2.7.STABLE9/src/client_side.c	2010-08-07 06:48:37.000000000 +0200
-@@ -4698,14 +4698,7 @@
- 	debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-     } else {
- 	if (do_debug(83, 4)) {
--	    /* Write out the SSL session details.. actually the call below, but
--	     * OpenSSL headers do strange typecasts confusing GCC.. */
--	    /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L
--	    PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
--#else
- 	    PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
--#endif
- 	    /* Note: This does not automatically fflush the log file.. */
- 	}
- 	debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-diff -Nru squid-2.7.STABLE9.orig/src/defines.h squid-2.7.STABLE9/src/defines.h
---- squid-2.7.STABLE9.orig/src/defines.h	2009-06-26 00:49:28.000000000 +0200
-+++ squid-2.7.STABLE9/src/defines.h	2010-08-07 06:48:37.000000000 +0200
-@@ -259,7 +259,7 @@
- 
- /* were to look for errors if config path fails */
- #ifndef DEFAULT_SQUID_ERROR_DIR
--#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
-+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
- #endif
- 
- /* gb_type operations */
-diff -Nru squid-2.7.STABLE9.orig/src/main.c squid-2.7.STABLE9/src/main.c
---- squid-2.7.STABLE9.orig/src/main.c	2010-03-07 16:58:56.000000000 +0100
-+++ squid-2.7.STABLE9/src/main.c	2010-08-07 06:48:37.000000000 +0200
-@@ -376,6 +376,22 @@
-     asnFreeMemory();
- }
- 
-+#if USE_UNLINKD
-+static int
-+needUnlinkd(void)
-+{
-+    int i;
-+    int r = 0;
-+    for (i = 0; i < Config.cacheSwap.n_configured; i++) {
-+       if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 ||
-+           strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 ||
-+           strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0)
-+          r++;
-+    }
-+    return r;
-+}
-+#endif
-+
- static void
- mainReconfigure(void)
- {
-@@ -614,7 +630,7 @@
- 
-     if (!configured_once) {
- #if USE_UNLINKD
--	unlinkdInit();
-+	if (needUnlinkd()) unlinkdInit();
- #endif
- 	urlInitialize();
- 	cachemgrInit();
-@@ -637,6 +653,9 @@
- #if USE_WCCPv2
-     wccp2Init();
- #endif
-+#if USE_UNLINKD
-+    if (needUnlinkd()) unlinkdInit();
-+#endif
-     serverConnectionsOpen();
-     neighbors_init();
-     if (Config.chroot_dir)
-diff -Nru squid-2.7.STABLE9.orig/src/Makefile.am squid-2.7.STABLE9/src/Makefile.am
---- squid-2.7.STABLE9.orig/src/Makefile.am	2010-03-14 21:25:55.000000000 +0100
-+++ squid-2.7.STABLE9/src/Makefile.am	2010-08-07 06:48:37.000000000 +0200
-@@ -339,13 +339,13 @@
- DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
--DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
-+DEFAULT_LOG_PREFIX	= $(localstatedir)/log/squid
- DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
-+DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
- DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
- DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD		= $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.1.18-ecap.patch b/net-proxy/squid/files/squid-3.1.18-ecap.patch
deleted file mode 100644
index 41f716a4fe5d..000000000000
--- a/net-proxy/squid/files/squid-3.1.18-ecap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-------------------------------------------------------------
-revno: 10415
-revision-id: squid3@treenet.co.nz-20111206123135-sm3zauds1twjh9ls
-parent: squid3@treenet.co.nz-20111203061825-aslncq2igkzd88hy
-fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3440
-author: Joshua Root <josh+squid@root.id.au>
-committer: Amos Jeffries <squid3@treenet.co.nz>
-branch nick: SQUID_3_1
-timestamp: Tue 2011-12-06 05:31:35 -0700
-message:
-  Bug 3440: compile error in Adaptation
-------------------------------------------------------------
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: squid3@treenet.co.nz-20111206123135-sm3zauds1twjh9ls
-# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
-#   /SQUID_3_1/
-# testament_sha1: 42421665894427e4edfaa3f8bfcee9a9a3ce9dab
-# timestamp: 2011-12-06 12:33:05 +0000
-# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
-#   /SQUID_3_1
-# base_revision_id: squid3@treenet.co.nz-20111203061825-\
-#   aslncq2igkzd88hy
-# 
-# Begin patch
-=== modified file 'src/Store.h'
---- a/src/Store.h	2011-12-02 12:17:07 +0000
-+++ b/src/Store.h	2011-12-06 12:31:35 +0000
-@@ -191,7 +191,7 @@
- 
- #if USE_ADAPTATION
-     /// call back producer when more buffer space is available
--    void deferProducer(const AsyncCall::Pointer &producer);
-+    void deferProducer(AsyncCall::Pointer &producer);
-     /// calls back producer registered with deferProducer
-     void kickProducer();
- #endif
-
-=== modified file 'src/store.cc'
---- a/src/store.cc	2011-12-02 12:17:07 +0000
-+++ b/src/store.cc	2011-12-06 12:31:35 +0000
-@@ -368,7 +368,7 @@
- 
- #if USE_ADAPTATION
- void
--StoreEntry::deferProducer(const AsyncCall::Pointer &producer)
-+StoreEntry::deferProducer(AsyncCall::Pointer &producer)
- {
-     if (!deferredProducer)
-         deferredProducer = producer;
-
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
deleted file mode 100644
index 78589b07dcc9..000000000000
--- a/net-proxy/squid/files/squid.initd
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $
-
-extra_started_commands="reload rotate"
-
-depend() {
-	use dns
-	need net
-}
-
-upprocval() {
-	[ -f $1 ] || return 0
-	if [ `cat $1` -lt $2 ]; then
-		echo $2 > $1
-	fi
-}
-
-# Try to increase the # of filedescriptors we can open.
-maxfds() {
-	[ -n "$SQUID_MAXFD" ] || return
-	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
-	local minimal_file_max=$(($SQUID_MAXFD + 4096))
-	upprocval /proc/sys/fs/file-max $minimal_file_max
-	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
-		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
-	fi
-	ulimit -n $SQUID_MAXFD
-}
-
-checkconfig() {
-	if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
-		eerror "You need to create /etc/squid/${SVCNAME}.conf first."
-		eerror "An example can be found in /etc/squid/squid.conf.default"
-		return 1
-	fi
-
-	local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
-	[ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
-	if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
-		eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
-		eerror "   /var/run/${SVCNAME}.pid"
-		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
-		eerror "         in any other instance of squid."
-		return 1
-	fi
-
-	maxfds
-
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
-	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-	
-	local x
-	for x in $CACHE_SWAP ; do
-		if [ ! -e $x ] ; then
-			ebegin "Initializing cache directory ${x%/*}"
-			local ORIG_UMASK=$(umask)
-			umask 027
-
-			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
-				eend 1
-				return 1
-			fi
-
-			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
-			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
-				umask $ORIG_UMASK
-				eend 1
-				echo "$INIT_CACHE_RESPONSE"
-				return 1
-			fi
-
-			umask $ORIG_UMASK
-			eend 0
-			break
-		fi
-	done
-	
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
-	eend $? && sleep 1
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
-		# Now we have to wait until squid has _really_ stopped.
-		sleep 1
-		if [ -f /var/run/${SVCNAME}.pid ] ; then
-			einfon "Waiting for squid to shutdown ."
-			cnt=0
-			while [ -f /var/run/${SVCNAME}.pid ] ; do
-				cnt=$(expr $cnt + 1)
-				if [ $cnt -gt 60 ] ; then
-					# Waited 120 seconds now. Fail.
-					echo
-					eend 1 "Failed."
-					break
-				fi
-				sleep 2
-				echo -n "."
-			done
-			echo
-		fi
-	else
-		eerror "Squid shutdown failed, probably service is already down."
-	fi
-	eend 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	/usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
-	eend $?
-}
-
-rotate() {
-	service_started ${SVCNAME} || return 1
-	ebegin "Rotating ${SVCNAME} logs"
-	/usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
-	eend $?
-}
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
deleted file mode 100644
index 3c501214769c..000000000000
--- a/net-proxy/squid/files/squid.initd-logrotate
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.12 2012/01/02 20:05:25 polynomial-c Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	use dns
-	need net
-}
-
-upprocval() {
-	[ -f $1 ] || return 0
-	if [ `cat $1` -lt $2 ]; then
-		echo $2 > $1
-	fi
-}
-
-# Try to increase the # of filedescriptors we can open.
-maxfds() {
-	[ -n "$SQUID_MAXFD" ] || return
-	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
-	local minimal_file_max=$(($SQUID_MAXFD + 4096))
-	upprocval /proc/sys/fs/file-max $minimal_file_max
-	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
-		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
-	fi
-	ulimit -n $SQUID_MAXFD
-}
-
-checkconfig() {
-	if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
-		eerror "You need to create /etc/squid/${SVCNAME}.conf first."
-		eerror "An example can be found in /etc/squid/squid.conf.default"
-		return 1
-	fi
-
-	local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
-	[ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
-	if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
-		eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
-		eerror "   /var/run/${SVCNAME}.pid"
-		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
-		eerror "         in any other instance of squid."
-		return 1
-	fi
-
-	maxfds
-
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
-	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-	
-	local x
-	for x in $CACHE_SWAP ; do
-		if [ ! -e $x ] ; then
-			ebegin "Initializing cache directory ${x%/*}"
-			local ORIG_UMASK=$(umask)
-			umask 027
-
-			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
-				eend 1
-				return 1
-			fi
-
-			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
-			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
-				umask $ORIG_UMASK
-				eend 1
-				echo "$INIT_CACHE_RESPONSE"
-				return 1
-			fi
-
-			umask $ORIG_UMASK
-			eend 0
-			break
-		fi
-	done
-	
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
-	eend $? && sleep 1
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
-		# Now we have to wait until squid has _really_ stopped.
-		sleep 1
-		if [ -f /var/run/${SVCNAME}.pid ] ; then
-			einfon "Waiting for squid to shutdown ."
-			cnt=0
-			while [ -f /var/run/${SVCNAME}.pid ] ; do
-				cnt=$(expr $cnt + 1)
-				if [ $cnt -gt 60 ] ; then
-					# Waited 120 seconds now. Fail.
-					echo
-					eend 1 "Failed."
-					break
-				fi
-				sleep 2
-				echo -n "."
-			done
-			echo
-		fi
-	else
-		eerror "Squid shutdown failed, probably service is already down."
-	fi
-	eend 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	/usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
-	eend $?
-}
diff --git a/net-proxy/squid/squid-3.1.19.ebuild b/net-proxy/squid/squid-3.1.19.ebuild
deleted file mode 100644
index c391ad9e59b2..000000000000
--- a/net-proxy/squid/squid-3.1.19.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.19.ebuild,v 1.10 2012/12/07 23:11:38 ago Exp $
-
-EAPI=4
-
-inherit eutils pam toolchain-funcs autotools linux-info user
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${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 \
-	mysql postgres sqlite \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux +epoll tproxy"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:0 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	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 )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-REQUIRED_USE="tproxy? ( caps )"
-
-pkg_pretend() {
-	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
-		eerror "coss store IO has been disabled by upstream due to stability issues!"
-		eerror "If you want to install this version, switch the store type to something else"
-		eerror "before attempting to install this version again."
-
-		die "/etc/squid/squid.conf: cache_dir uses a disabled store type"
-	fi
-
-	if use tproxy; then
-		echo
-		elog "Checking kernel configuration for full Tproxy4 support"
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-		echo
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.15-gentoo.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	local basic_modules="getpwnam,NCSA,MSNT"
-	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-	use radius && basic_modules="squid_radius_auth,${basic_modules}"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules="DB,${basic_modules}"
-	fi
-
-	local digest_modules="password"
-	use ldap && digest_modules="ldap,${digest_modules}"
-
-	local ext_helpers="ip_user,session,unix_group"
-	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local ntlm_helpers="fakeauth"
-	use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
-
-	local negotiate_helpers=
-	if use kerberos; then
-		negotiate_helpers="squid_kerb_auth"
-		if has_version app-crypt/mit-krb5; then
-			myconf="--enable-mit=${EPREFIX}/usr --disable-heimdal"
-		elif has_version app-crypt/heimdal; then
-			myconf="--disable-mit --enable-heimdal=${EPREFIX}/usr"
-		fi
-	else
-		myconf="--disable-mit --disable-heimdal"
-	fi
-
-	# coss support has been disabled
-	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
-	myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter \
-			$(use_enable tproxy linux-tproxy) \
-			$(use_enable epoll)"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} $(use_enable kqueue)"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/var/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-auth="basic,digest,negotiate,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="${digest_modules}" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
-		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-large-files \
-		--with-filedescriptors=8192 \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		$(use_enable zero-penalty-hit zph-qos) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/pam_auth
-		fperms 4750 /usr/libexec/squid/pam_auth
-	fi
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
-	echo
-	elog "Squid authentication helpers have been installed suid root."
-	elog "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	elog "Be careful what type of cache_dir you select!"
-	elog "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	elog "when there isn't sufficient traffic to keep squid reasonably busy."
-	elog "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-}
diff --git a/net-proxy/squid/squid-3.1.21.ebuild b/net-proxy/squid/squid-3.1.21.ebuild
deleted file mode 100644
index 6f1ba55916ed..000000000000
--- a/net-proxy/squid/squid-3.1.21.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.21.ebuild,v 1.1 2012/09/25 09:19:35 eras Exp $
-
-EAPI=4
-inherit eutils pam toolchain-funcs autotools linux-info user
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${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 \
-	mysql postgres sqlite \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux +epoll tproxy"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:0 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	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 )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-REQUIRED_USE="tproxy? ( caps )"
-
-pkg_pretend() {
-	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
-		eerror "coss store IO has been disabled by upstream due to stability issues!"
-		eerror "If you want to install this version, switch the store type to something else"
-		eerror "before attempting to install this version again."
-
-		die "/etc/squid/squid.conf: cache_dir uses a disabled store type"
-	fi
-
-	if use tproxy; then
-		echo
-		elog "Checking kernel configuration for full Tproxy4 support"
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-		echo
-	fi
-}
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.15-gentoo.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	local basic_modules="getpwnam,NCSA,MSNT"
-	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-	use radius && basic_modules="squid_radius_auth,${basic_modules}"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules="DB,${basic_modules}"
-	fi
-
-	local digest_modules="password"
-	use ldap && digest_modules="ldap,${digest_modules}"
-
-	local ext_helpers="ip_user,session,unix_group"
-	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local ntlm_helpers="fakeauth"
-	use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
-
-	local negotiate_helpers=
-	if use kerberos; then
-		negotiate_helpers="squid_kerb_auth"
-		if has_version app-crypt/mit-krb5; then
-			myconf="--enable-mit=${EPREFIX}/usr --disable-heimdal"
-		elif has_version app-crypt/heimdal; then
-			myconf="--disable-mit --enable-heimdal=${EPREFIX}/usr"
-		fi
-	else
-		myconf="--disable-mit --disable-heimdal"
-	fi
-
-	# coss support has been disabled
-	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
-	myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter \
-			$(use_enable tproxy linux-tproxy) \
-			$(use_enable epoll)"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} $(use_enable kqueue)"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/var/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-auth="basic,digest,negotiate,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="${digest_modules}" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
-		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-large-files \
-		--with-filedescriptors=8192 \
-		--disable-strict-error-checking \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		$(use_enable ecap) \
-		$(use_enable zero-penalty-hit zph-qos) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/pam_auth
-		fperms 4750 /usr/libexec/squid/pam_auth
-	fi
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
-	echo
-	elog "Squid authentication helpers have been installed suid root."
-	elog "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	elog "Be careful what type of cache_dir you select!"
-	elog "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	elog "when there isn't sufficient traffic to keep squid reasonably busy."
-	elog "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-}
diff --git a/net-proxy/squid/squid-3.2.3.ebuild b/net-proxy/squid/squid-3.2.3.ebuild
deleted file mode 100644
index 4ca70920ab72..000000000000
--- a/net-proxy/squid/squid-3.2.3.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.3.ebuild,v 1.4 2012/12/01 18:19:20 armin76 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"
-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 )"
-
-REQUIRED_USE="tproxy? ( caps )
-			qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		echo
-		elog "Checking kernel configuration for full Tproxy4 support"
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-		echo
-	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
-	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=/var/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 \
-		--with-filedescriptors=8192 \
-		--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" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate-r1" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd-r1" 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
-}