Version bump. Use max_filedescriptors to determine the max number of files squid can open. Fix DEPEND - bug #383367

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

7 files changed, 714 insertions, 15 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e1aeaf5e3c36..e2ac2b2e9a1f 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.372 2013/01/04 08:22:07 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.373 2013/01/11 15:25:49 eras Exp $
+
+*squid-3.2.6 (11 Jan 2013)
+*squid-3.1.23 (11 Jan 2013)
+
+  11 Jan 2013; Eray Aslan <eras@gentoo.org> +files/squid.confd-r1,
+  +files/squid.initd-logrotate-r3, +files/squid.initd-r3, +squid-3.1.23.ebuild,
+  +squid-3.2.6.ebuild:
+  Version bump. Use max_filedescriptors to determine the max number of files
+  squid can open.  Fix DEPEND - bug #383367
 
   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,
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index d96505c0525c..c9725a779657 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,33 +4,40 @@ Hash: SHA256
 AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7
 AUX squid-3.2.1-gentoo.patch 4418 SHA256 41da185c1af04590525fc9144c14edd160522b878efc2e62e8a992a001ad38e0 SHA512 08ba6aac7de61aaae9a96c42801dbb8e414a2b8ec7bccd80afb1973f7c9949dacee4011e54d050c7ae46a06d2914ca8a42629af5707c6810b1547e3b66ccd5c0 WHIRLPOOL 2f8ba78840e46a3b8e780b653d8084f9c0e8b4d0793f4b06cb7faf9c6ae32b193de923b411c394278747ad9574cbf317f72f97467fbca386db4c4f1bd0f1ba50
 AUX squid.confd 540 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec SHA512 db9a9f2d476df279e1f2c9ec6bdec42d0c4cd9117c78e2ce5876855bd91add5c01bf06d34456e9146fe70374b118ae20a8e75bf07254aa335dd3190e11c72d23 WHIRLPOOL 55863f771bb4ffc39dd809e5233bbfce994a8e4345f84d264c427b7d5d571c998b0011b71f878df2ff4d7037da250e62296f9c962a8118532e25af9297471995
+AUX squid.confd-r1 493 SHA256 214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e SHA512 3f92645275e077bcf36e4cd2ccb56812540276d9456bc6f68268010aac57214f0d96b0aff74dc57cbc3446705a9fae8a5bb7a07304afeea45615ebf2cf2b7ab0 WHIRLPOOL 080cfb797ddb49f7c59463eaef0db8c3a6ec5e5da949884e9ccdf54d608b22fb81971aec21fab704c832c86a8c8e3d4795a7b09456c273d7c4bbb65692a68870
 AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 WHIRLPOOL 029c94d4e4826ee612c7dc12acc088e3100c9d1737baebb74b25b6e7ac2ba78d0bab9f744c12b5de4113c9727892c9a30dd17067409ac8da62afeee552de391e
 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-logrotate-r3 3133 SHA256 02a7f23a30acce6a3090b324e8c70c0f966380364f839bb0e58935a9a6820b35 SHA512 7e96f4d523d10531b546fece23cb62f073de08181ff796e744190964d1d584400855fa4fb2ad43ed966d92de0c6826efdb19f24ab453ffd3b60e600543de34fa WHIRLPOOL a82b693268afec6149c2f61c4c2c28472f6190e0e6070805f23c380c20df1729e57e0a581fdbd657332f9bf772e27a2269f855d2240952b586cfcfe1476d1089
 AUX squid.initd-r1 3319 SHA256 f38e04ba1e295e9bbb537e353823c4bd738d206f4790d024e65aacfefbfe7abb SHA512 fc60c330dfebc2ff9f964b6475d8d00fcf69211384b605b68fef95daf5adc23c0d9fe1b72d858923449f7f024e8520bb7aa17d1ffa55e40f8de2726aa234125a WHIRLPOOL 27a43a425b67fb00a654b9bb71062aac63c7c4885bbd9493341043bb7147f8f7ac89ab79e015008f9da10b0a68f00b038d1ef932f7e0c350dfc9b3fc0fd9033e
 AUX squid.initd-r2 3191 SHA256 b6f91362925869151ecbea7bfa654c1bdec489170a0df775c9ac6248e9dd89dd SHA512 81e2c1fc697cce91ff7dd5a03711a8dc9ed8f51fa91daf9223e36474cbadc07772bfcea58dc49dc2b99167e2637eae5390fa3d042c319cf9f8eacc2f79f4cf4a WHIRLPOOL 469a1ec1c8fcd549c43349a174878a100ba89cb0a8e245373eaf33c9e1656473f8fa15149386fcde3a2ad5299f5491381e285483d4c0d4b5838b391ef39f3f4b
+AUX squid.initd-r3 3285 SHA256 9b16b1ab2d3d3411dfcd8ac76b13a0889503ca78e3c6123814801af7577537f3 SHA512 3ec1a924922dcaf6634eda6f18e7010c722294e446aeb997fe77f539bdd1a45c7aa0551a356d9e4b90419e815cc0a2d1fa119575cdff4d0477f9bc3f8c6b8aff WHIRLPOOL 3f8c1070ffe5114de7a50f0eda2ff6d5c814eafb63942b8a80e6fab27be6ee2364676227aed18995a4151e38d7a1f51398ca31a771682ba811bc4a73831f38ed
 AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
 DIST squid-3.1.22.tar.gz 3489587 SHA256 59764791cc030779f764fa077f2668bd0c8ebd25ce2f72c6526728de3c82369f SHA512 4ba31205397679d901fa702bad4f177f7ab1f4e1f7714c8be00318c3b2235e46122bf62ec5bc82ad081484869e4d1ee86d14eb060a1cd1240cd2bbac634426b8 WHIRLPOOL 7788205d852c71e2b489802db2fb9a82ccfdb12a4133cf157e96b2d1932554e61e314365ecefa02832670641f05e77ac5fb063518efd560a9f3ccd8a18c32004
+DIST squid-3.1.23.tar.gz 3489539 SHA256 4633e59925480cc2ea8078e4d78b17dea59a67a71c054b8faa47ba2c1e204401 SHA512 620554273a54be76331dd559446f750dfe838c80e2427cdcfce89ebdb0b70124acc6015fb6f4f1c78d0ecd0e0aaf46ca2cec29e1415525ef72e14d18343a5e72 WHIRLPOOL cb678a25abf69d73f7f5b5774c00374d14c831b09af86678f065dd8001aedc9f4ba5fa8a8d8d8c301ab449e10d25a54d476810e2d5c77583ed604b6173f41bcd
 DIST squid-3.2.5.tar.gz 4107649 SHA256 331a507fec11c89b5ccfabaf9eedd6c208eaa0a64b0aba4c2477f68443b35b69 SHA512 0107b38d49423f354d2bea7cedd3f8114d56ac72175a1235d72b58f9b1735c0acfad76fae131cdb8b912e407e761d445ba8b8ddea088387baed470913c13ccc2 WHIRLPOOL c45202e9b9342f74f864c362b8af7dc2cd720ec8eacd424ef8e7e48ebdc32ebe6b30b6534c277256bc86cd51e073f824bf8395290f05b2451aafb307c1cf2147
+DIST squid-3.2.6.tar.gz 4108394 SHA256 cd3a61fb6784a942ba8809919c7bbcd924dabc109485cb45f2ac2f0dce63429a SHA512 232af970a41b62eeaf50211ff9afeef5978f1d04a637a67859f55bde36aa89faf2e90aa267fde3c5aaa7092e8c7285d7a0591e42db9c4452ad4d6d44833fdb6c WHIRLPOOL fa72daa46a2c994936d0cf636f4facdceb01cef7d5c139929be0fd27b2bf598c25f942f5bb1248b98e28fcf7a23d5ce59c13f81c134acb6e361d54f92b851999
 EBUILD squid-3.1.22.ebuild 6638 SHA256 c0a1e6cc8939550d85f44c56f70cb3ff0bf74797a8bb3111441ab275f28e0ff9 SHA512 312f1ad13015ffdbdfbc6062806585b001215bb7905d233d0ae0146f2289750b0585ea13b7331b96082c3cb1e6b67833ed5ad899192c87c16e88cd9351bc5fb4 WHIRLPOOL dc5ad35e6bedd6fe147f0e2857739762a3d0ab578a43556ab04ee05c9fcdaa8b92c2e86e10975e33123ef8ec1e49472a1ca38853106bfe4e9b52fdaffd0e1895
+EBUILD squid-3.1.23.ebuild 6666 SHA256 60befed3dad86ee936abb17d4edce3f31497588e8d4055702c7d0922bb0afed4 SHA512 d5cb02a6b702057b3b0f1ce37cbc3609b8bc11947b957784b56770755eb4c01e732edf25cb18f493ee8ede8a611826d2daa44eb3695f8de66b730d2db4b53fe1 WHIRLPOOL 415dc2c4c04623ef4672403c6add2c3fc0101c83efd41fea44d2680654b6cdfa5e8b26b3fef67d1e62a6cfbc1b22c64b08e5622a2fec3a3bf73f946eef58e2fa
 EBUILD squid-3.2.5.ebuild 7561 SHA256 677e9d155456005e2c9ce45f916201a65a65e9ae4e3909949e118c178521c1b6 SHA512 88f01b615b90712d8d344ca8c603f1ebd7a2d434f62165e96339f4b138cc6426f0acd1002a1d082d74b572f051afd52a8d037e790a7a1bdf906491f201b42af3 WHIRLPOOL 68e0772473f2e4c101aafd238bc48cfdaa517b410be2f6a5fd37f0e517d2f1f67d397a8da20531f4a7b79bde65d66178098d78a8a9a374e02fd035841d3d8a8b
-MISC ChangeLog 75632 SHA256 b32a76f030a24a7c97868e10e6f4e91768a7aecd5a45ee0b8812861a95bf65a4 SHA512 4b413ecbf2a8647b27f623a278b29c6a0fd306f249ce41db7980cdbbbaa75134173d32965557cab7553d9dbda5c2c04dac90e19a88c97b3f9b48ceca50534200 WHIRLPOOL 21b6e9f1f136afe12be954e263e448f77aab67751fa49425e2eb95897cd10d8f15e3a55d2bf39a4fe06f6ea5060f43bdf32f25e9a45c3c569f2ee30b458db95d
+EBUILD squid-3.2.6.ebuild 7551 SHA256 1aa220960b7bd18b9c10407430c87eae10bae54c693744f6dcc0b3fa1bbfabf8 SHA512 9efac1ddab610a9bb4b134212f3ca07009debf58b32da29a884372bcb53221fcafa2e8e85403d0434022e2a3f315f6a40d74d0be2561af94302203ed6384d15c WHIRLPOOL a721f67dcc77630056bb92ec654a6878b807af33e4039d3718f9f47a18eea9ac47f6495c3ef4b73ff1eaa0f1d4af225e6e48660436b7d9a103462121471f3fec
+MISC ChangeLog 75980 SHA256 c2dd966fd78743bb95cce543a0876a6582f2620e89d30a8ac4d998a95cb8e747 SHA512 06555d3c16dbc27c454b4d989e4fc5cb5f5a33b3ac6788f9969f57d28e7da33f1a18a368b8101e2942e7ad9ab144a6ecf1a9fca1146248a721e40675ac287200 WHIRLPOOL 9b749ca080721f20fe5ecdcba0595b019750bdd775533463bfd4b551c0b164930c6b85beb880b81351882de24fdc8371cb7bcddbe040ff57ed3b3f78b25c292b
 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
+iQIcBAEBCAAGBQJQ8C8KAAoJEHfx8XVYajsfZS0QAKZIqNnX3/LuPS/t6jcXGLET
+Yzulqd+nyZXWRZm1hASJD8Hh93ZVzkfQFokiakC9zZ+JoJ2bTMtdw4VRKUPDZAEA
+uhuCrGB7OcCeJZC2R7iYUB3x1Wij3/Sd3Qvbb07s1Q0n6Sx13Faa+Wzp6Pk7wfox
+EmdnBXMbSnvki0zVtTFV8ZGsTw7dl4pd9kVpwtHgNy2EcwF64bvxLaD64puJSmrJ
+O2OvFPcFlPJw9C3V4f17X7DQFaOrASpY0QmLOLO9UjtspD1khIr0MyiVSPAnbz0V
+IiAB8it65NOZiXkrQQ4zkl2ZWrEBPODMJGVX8N9lTG4kSqWoEHiyXFQf3Sguz5Ss
+wEsOCCJQBOGfkwC/OcNCkkR2Rm2+FJuwT7G3AQ3zUPJPSFkkonPPHVdNjP9/jl/u
+GzOmvD6wwBHoxoXTIrjAk/BX6V1WeOPtVcSwf7USPkvgYgCEGfq05oKOflfT+aUG
+W/e2a9dEtaiHhEW+sILC2G87/pkaM8NQdEl6fPQSFM3Xt1jeCuEHlUSXy0XQiEKu
+jMXSxIeHckK2/ae9TeSAut+ShXGGaLBJtoYZtdIygz7eiTcWQ8pDHq0N+OfUNy1z
+6HLtSeX/obTarGNcV7wuwQh1pbYgzAsBWBl1dexBbjvO39QRg8HoIJNDFVhC2TKC
+Sck9IJLPpOvnVEQIrfq6
+=KguT
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid.confd-r1 b/net-proxy/squid/files/squid.confd-r1
new file mode 100644
index 000000000000..f17bfe06f9a9
--- /dev/null
+++ b/net-proxy/squid/files/squid.confd-r1
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd-r1,v 1.1 2013/01/11 15:25:49 eras Exp $
+
+# Config file for /etc/init.d/squid
+
+SQUID_OPTS="-YC"
+
+# Kerberos keytab file to use. This is required if you enable kerberos authentication.
+SQUID_KEYTAB=""
+
+# Use max_filedescriptors setting in squid.conf to determine the maximum number
+# of filedescriptors squid can open.
diff --git a/net-proxy/squid/files/squid.initd-logrotate-r3 b/net-proxy/squid/files/squid.initd-logrotate-r3
new file mode 100644
index 000000000000..8aaf7ad93f5d
--- /dev/null
+++ b/net-proxy/squid/files/squid.initd-logrotate-r3
@@ -0,0 +1,109 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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-r3,v 1.1 2013/01/11 15:25:49 eras Exp $
+
+extra_started_commands="reload"
+
+depend() {
+	use dns net
+}
+
+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
+
+	# Maximum file descriptors squid can open is determined by:
+	# a basic default of N=1024
+	#  ... altered by ./configure --with-filedescriptors=N
+	#  ... overridden on production by squid.conf max_filedescriptors (if,
+	#  and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
+	# Since we do not configure hard coded # of filedescriptors anymore,
+	# there is no need for ulimit calls in the init script.
+	# Use max_filedescriptors in squid.conf instead.
+
+	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/files/squid.initd-r3 b/net-proxy/squid/files/squid.initd-r3
new file mode 100644
index 000000000000..59564321749b
--- /dev/null
+++ b/net-proxy/squid/files/squid.initd-r3
@@ -0,0 +1,116 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-r3,v 1.1 2013/01/11 15:25:49 eras Exp $
+
+extra_started_commands="reload rotate"
+
+depend() {
+	use dns net
+}
+
+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
+
+	# Maximum file descriptors squid can open is determined by:
+	# a basic default of N=1024
+	#  ... altered by ./configure --with-filedescriptors=N
+	#  ... overridden on production by squid.conf max_filedescriptors (if,
+	#  and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
+	# Since we do not configure hard coded # of filedescriptors anymore,
+	# there is no need for ulimit calls in the init script.
+	# Use max_filedescriptors in squid.conf instead.
+
+	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/squid-3.1.23.ebuild b/net-proxy/squid/squid-3.1.23.ebuild
new file mode 100644
index 000000000000..c82639c33cae
--- /dev/null
+++ b/net-proxy/squid/squid-3.1.23.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v 1.1 2013/01/11 15:25:49 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
+	sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+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-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
+
+	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.6.ebuild b/net-proxy/squid/squid-3.2.6.ebuild
new file mode 100644
index 000000000000..2651f5d6db01
--- /dev/null
+++ b/net-proxy/squid/squid-3.2.6.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild,v 1.1 2013/01/11 15:25:49 eras Exp $
+
+EAPI=4
+inherit eutils pam toolchain-funcs autotools linux-info user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:2 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	sys-devel/libtool
+	dev-lang/perl
+	sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+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 \
+		--disable-strict-error-checking \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		${transparent}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+	newdoc helpers/basic_auth/LDAP/README README.LDAP
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd-r3" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
+		echo
+	fi
+}