Version bump. Perl-5.20 fix - bug #539500

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

4 files changed, 304 insertions, 16 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index ff6516727e91..b4bdbb2d05c4 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.515 2015/02/18 09:16:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.516 2015/02/23 08:52:19 eras Exp $
+
+*squid-3.5.2 (23 Feb 2015)
+
+  23 Feb 2015; Eray Aslan <eras@gentoo.org> +files/squid-13934_13933.patch,
+  +squid-3.5.2.ebuild:
+  Version bump. Perl-5.20 fix - bug #539500
 
   18 Feb 2015; Agostino Sarubbo <ago@gentoo.org> squid-3.4.11-r1.ebuild:
   Stable for ppc, wrt bug #538132
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 38efdc1587fd..53fab69ed4c5 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX squid-12683_12681.patch 8985 SHA256 bef94f856ecbdfb88630bf75b8f1177a1efcba40b32b8ccd61ac2414daf40d75 SHA512 7e148cc62fbe0e3efea8731154b762c40d9e97a12978ff521aa0a90c225ff5b09d54388da671b05495c5c4eb9bf30ef492ad659d293f99a73ee2a0230a9c2f91 WHIRLPOOL 9af1913ab70a889d8fd7937910f5670a0f5b4678ed30df37f34b2bcf7a96640241419f43667f24d82ce7fffd0efa59b31e973658ba9bd4662e4581ca8f68dfaf
 AUX squid-13211_13210.patch 1719 SHA256 2e1e45f4800cb17a5e35fdc5a8add7581e08cb7c0bb39852be63fe84127f3d85 SHA512 764359afa7aa1ccd80b8349a01a6c92eb4c32ca1106776fde5f59b5af71cfeb63cf6d9afc777d12a8e13db46a92ee2d4cd1dc1b79a48fb06c92f433c66b7fb64 WHIRLPOOL 3f9c95888f82d499a9e95de0f49474a06727916d7928e8f8c7ff2ad3bdf14213b60f97d0a4547e8e81f88c16c41c8bc404c04dd93d6788c2bf33b2687d495a7f
 AUX squid-13735_13734.patch 1704 SHA256 895f83d35c438e07c14d1780fcb25ede604ab4ed096cf72bea424396acf82735 SHA512 2bddcbf34413b20c03c0cbc2760cbbb53cf52ef00cefcb02200f74ca7d0f1621ae2c35d37a47bdff6ee705c1c22ad885f94b0c86c719565dfa794447d2719a26 WHIRLPOOL 782c92e8ae83bc3231a6eaf982af6467a386d5751664ae60f1ce1482e740f0d8811617c59963995e2b78382a49a42f6a6f3cee50cecbdfedfb4fe9c827cdc42a
+AUX squid-13934_13933.patch 694 SHA256 cc647f668c8b4df406af6007e342b7864483b7a42904e4af467194c0b2442220 SHA512 60a79fc7462abc3ea577a5e5eaa24a00722629733b9c86df2eb1cc8ca35ae802304d92a5822c74676ba7ac69876aeaac742594f28da846ada6ba8947eab324f8 WHIRLPOOL 80fabcdd07d9fccd8376e808b47b21bf8459fa2a402cec39b9f38ed901d2814151dbd20c8d9e00aa6e4e11a8fae8489f33f654aeff437e35c7b924cc23b6ca96
 AUX squid-3.3.4-gentoo.patch 4358 SHA256 d52c1c89c81540dfd6c464f7c4245857fdd6cc9e45568a03d4f028fe5feb8bb0 SHA512 b1bfb0a1298e30ce30681b8bcaed292a883f8153e3df61861d1dfd691c5f4d5bc4651531ac69932fcbdc74c5896ed4495d54810203d4c0674ceb49b33454f297 WHIRLPOOL 3b98a43c1cc98d20f28dd5eb096344ff80ec5de1e4e17c4a3b8fb5d89044b6090466bfd3a7e24dfb975d9e02009af900372ee8c791991921def12820a191da97
 AUX squid.confd-r1 493 SHA256 214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e SHA512 3f92645275e077bcf36e4cd2ccb56812540276d9456bc6f68268010aac57214f0d96b0aff74dc57cbc3446705a9fae8a5bb7a07304afeea45615ebf2cf2b7ab0 WHIRLPOOL 080cfb797ddb49f7c59463eaef0db8c3a6ec5e5da949884e9ccdf54d608b22fb81971aec21fab704c832c86a8c8e3d4795a7b09456c273d7c4bbb65692a68870
 AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 WHIRLPOOL 029c94d4e4826ee612c7dc12acc088e3100c9d1737baebb74b25b6e7ac2ba78d0bab9f744c12b5de4113c9727892c9a30dd17067409ac8da62afeee552de391e
@@ -14,28 +15,32 @@ DIST squid-3.3.13.tar.xz 2187728 SHA256 55d5875709b93f447788526527496956c508832a
 DIST squid-3.4.10.tar.xz 2161192 SHA256 fb6dccf9ba426eddfc7b5dfe8786971f9779c571a53739a8a41024b09b12f888 SHA512 4b90a8cb26947069d5cf2aeb6b7136b65ae3efd55d495f44af772f780b8c3f12de3b155a0992b6ab429efd2dc1461b551eb73db76a088bcc48118d7769c476af WHIRLPOOL 0da554852e2ba7725d1a4f726e231a1b180a0fab90626b53cbe95a2c14b36472a0ed9170f9b10d4709b10769c79a2478c588a88455910c16c2f60e48227ec25e
 DIST squid-3.4.11.tar.xz 2162148 SHA256 b4ede14221d043bbde94655aee195b090fe33a9a0a3d4ed83a9b41fcd46cac1d SHA512 e485e195f6ef95d7d2f5d327d9e229d9b3b678b035595853bc5d9a56a0494536239fa591bd56213014e08f9584e56d3511b0429e9fe9076d6e64a8b09867be69 WHIRLPOOL 5a3b1829eeda2b507971346bab3af142f19c650185940af82a238787b7265ab5e51535e815e1f87f0800071ca3053d8a0195da0ef02d27361e83951c4631ea63
 DIST squid-3.5.1.tar.xz 2281248 SHA256 3a3bc6b424149da5a4816786100f32e47b45e139144726722df3a87a6414d6f4 SHA512 eec2e3c364fe4f6f6b62ede0af8f62d09fe53db0bcd4d302b75470ef2880844ab398b1f8e05473971bb052eb72347078329c0598ccbb5ea7ebf6cb8df34cc858 WHIRLPOOL d6e91e2b3ec3f647f15720037b0016ed5deee0d51a116b5e4ec3a9b79b04a8c301473778f3ea0cbe8e1c75b054b9b9932b6534cd8d5dba11cc8bb9d763e1ca5a
+DIST squid-3.5.2.tar.xz 2282116 SHA256 5af2e16f279466f9fb89c2fef6c09b6824a7e3e7996c9f1c2bc16e7daddd751f SHA512 c6ce7a1dc19919f489b096a4cfb0c9a4787090168d6fadb9ec0519abe5ddb15388477af41cf21586e84027a89c41ac29b02872a014b29273e808cd9fd1f00c27 WHIRLPOOL d8394b6ccc5b98fd50f3be358da4359552086d40407fca8de8991b089e9d79cf142c95cecdf8aca63d295b9b4c88fe4958d1f2fda7291c956dcf0503a6a43041
 EBUILD squid-3.3.13-r1.ebuild 7748 SHA256 04777bfe1e7b0d67d76ace831ce39837c62552bb3c6cfcace7cb3d7454f63306 SHA512 c989367c920025b3592278c237658255d9d4c5f3ddff3732662d0fdb6833ebb55ddd44a1e966965f5cc0c5b5d8113016b1239aabbd6d459adf8fd5a00a636aa2 WHIRLPOOL dd3e5c63ba327ec9af37fd84ae8913e751dc20af51ddea77707742268a13c61d818734cc02389b09e5b39f91cba056515329892ecb9cddc62a24dd8f12eb7cec
 EBUILD squid-3.4.10.ebuild 7957 SHA256 ae31160052f47cfc0586a54eb5ed6f4122ee000cc61fac25d800d2a30ed27985 SHA512 0fd413cf062d7a20b16d890137188c6f3ebfa5349ccc6d0e60730a7ea0d01bd0ab8cafd35795b7a48c918fa0fdd52ac59f033a48b3c2dbb68349e3a8c57463e7 WHIRLPOOL 102cb4b3ec0c311bbe464718f1a6149177f3b360d03379e96dc7615254d8f6c497230d7450ddd174570a451061f901e66ce9e400f4f57c13d44b4c986c4cc00c
 EBUILD squid-3.4.11-r1.ebuild 7978 SHA256 1ce18ffc781a40bb73ed48e8e34b55024cb09a7709f52df04bcabc5f8340e37f SHA512 2db3a466a1b04107928eacb56651e639bb4025a78415bab182dec3b4eb8db1c7570251a3daacc204f4fd804f2fd7012b12479b4cfa713ee40cb18d35631403f5 WHIRLPOOL e7ccb7dcaf17bb84bcf2a749b253f3651296bc7f8b47a2dab9327a20f1dac6d9c81d81c1e3406d03f6526a344b8de84dbbf16c9d9f1891f17662c5a5bb100502
 EBUILD squid-3.4.11.ebuild 7937 SHA256 b3d10277e14ceb288d9086ff7c424b4312112960a884ec0e163420e72fe35bad SHA512 0165fc2fe6074d66e5bc251d8621385cff4fdcc63f424e2fa9c51e42f98498a5bfd4513949ed8ab25e27457e0ad8399013415d963a2fe2318c5bfcb07192770d WHIRLPOOL 84a531d225397db900a2aa0c48d98090bce7190587d288394ecbcdf472f61f04b87044cf324e52980c998c5c4df64c0402a8d59d6325a418d1661bd7567cee07
 EBUILD squid-3.5.1-r1.ebuild 7671 SHA256 76942f30c8a5bc4412c703619da01854bba5632ab037a6a58188b122a501e62f SHA512 680691fc99af72fb0315d8d26730413f4ba441500df7e50a6970194097f98b85e1ca03070786c177567ddaf29e9c27e142ed524c815932a852b941e1deaeb75f WHIRLPOOL 6495e6c073e289a454d4fb210ea48c73ca8714dbba937d67f5907b69779509bfbf2a0aa66a37051d0cb169eb66a1c279a0d84f13094aff0f98f442afe06a44a7
 EBUILD squid-3.5.1.ebuild 7622 SHA256 f8905b18292eb4cb70924561f93c5e62b96fd334b9e0f077991fec936cbe91e7 SHA512 18c9297e9badcb97f8d404473b9239c115b214b6bf1dcc56ce9a7ca359226a01373d6c408c12415b944c72343d1a4ba0c7aa7497d30944ed6cb4544211fcf177 WHIRLPOOL 7164515065e5370345197701044590e3982a58e3aad3fb4d16ae6890588eb05894020915e829ee7e357e1b8e98a94d45d89491526526bdb1b94c4012614a3f69
-MISC ChangeLog 93837 SHA256 4a2361599cc5cfc42b7e42218abb37fbc8713356426acd5460a944c371e6669f SHA512 ca0b8c26985c965c4f192e91e0681cfd94c6a113f7acb50a2dc7f9826f9193ce2b170ba8e3ebdb0f7976b1f9ff2e9263345178803d72c4a269d51ba21fe98697 WHIRLPOOL 323075a1c3ba0680bf1d1f768ac9e4680b8d723936cc2cc2768df0ca6eea46f3d346223bcc5d3604f361b4c3ee6db5cb47e56e98445dc3435cee7640055799b1
+EBUILD squid-3.5.2.ebuild 7674 SHA256 dde4d53a5a7ec2c74bbfc240444528adf55dd108b1e91c4be61d95b7080ccf50 SHA512 69540f19e0d89da9a0d61ff43725d30749d990bb17b506a47d8644773ef2ee6642137b8214360bda009d3fe6d72eec22c248f289e4d5044c8379bb25935a0de4 WHIRLPOOL 687b1cf268a67580a0ed3d01de51c8f8f535290127a0e59390ce49e237c976d981cfce742726394d860a76c0dc97c2e09be58fb27c7ad7aa2a1beacae783fb35
+MISC ChangeLog 94010 SHA256 f89cd4a948bd2ab648e6c539423617cc55d86a2cdc43aa30161e5d9339d7bbf0 SHA512 a1177de95a4987249038dcbb45eff5d55225ea7a4e1053311303638d909bffe542c828156325e5310a78cb90d534253167d266fd84521b7fee2cee450e439f50 WHIRLPOOL 347b286ab45e856b1ce031fa12acfce46db7ffa1986eda4dc4ab70b32d4068ebbacec8e5e773dc24a55ebd1364f2f04b3dbb5be67d77388847aeda52e371ea66
 MISC metadata.xml 1545 SHA256 72b1cd3b3476500f50f936459a522eca2fabcad046cc2647662bf18b75d57edf SHA512 20c78e621a6a58697108ae3e0a543a3ead301ccb50ba54266fa9775ef66fc24590ccc7a24d20883af656b8a295fac26527c65d236d4d46ae0e0df0c2d15c993d WHIRLPOOL 90a2470ab97b9d56e0b73410741194f30b1bed09f99ab71940ded398d3796ff8d87250ccfe419c544b2e85cebd8706d0c4beed926870f290694074c34317be90
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU5Fh8AAoJELp701BxlEWfq9cQAI7N6mDNKdT41eZYetqG2nVC
-YigPUfeb4bvVpKj4eOyMg7pYfdPNpgfby3Ei0DcD1AYT3TtBAPEB65rJD7DpEi5q
-L0dukkqiPAuDB8S5seArUFRzDFnIK1WLN5XpnAs5hDadYzUtUu26uFWgwZ/A5IxJ
-uZM3v/bOPlbIops4zzxHvTJFZ/QABz5/i9mFX+foutzgcb/LE0V0pf43EJqx2RuO
-1fzR6QoCDkgT7RElDvxhcjgBa5idAXC9QQPAsPsO5kgKxymPfFr4ovP3hg5Ucveq
-ja8ag9RV1Y5Z4kmDnwmtP9N+Wz632n+sbkfCAf1uWYzwDNCny3QKOxsIN/c1zjnx
-g0PgI8/8tmeOHgIqchsnNnruT/9MCVQFree4Tcr1PEiRO5YpASz+X6TDlt1StxVj
-oDA5iYXXHUbjZex77f7LFl9x+cdlxrdjTaaYrH6mDsoKQEqgAqC13kl5GLD+iqgb
-F8bYggW8BFy3iWfT6Dwy/K6HD2rSkyzHz8g8NT6Rrmm9+tvMVrRDUewS1cCrGW3v
-DrLq+LGBudBczcN9VVSmxob7t2r6g+oUWR3LKrvEfw0MFh8yjXTgLE+wkvrv032M
-pTXdudVz+OyiRbsQ/MQZuKmmvCGUGldS6Udj3DL9c+CF9gPmZQDIc12Klu3OY/HL
-oE/r5Qhj0pg55Oq9LOL6
-=93F3
+iQJ8BAEBCABmBQJU6upOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsf67QQAIPei3lgz9Rdr5/amGTiCv3F
+feiNGt6nWxylllBCzOxn+DymgxFdxknHAdOFjH1kfl59eN6lMPGP4WykoEUFtBRb
+f7F1BEYHqC8+728pmEXi7f1yN44AXK1fFwUufF/EJvM3Y/RXVI83IT/TSFUyseu0
+n4ivQmGr4mwxSt8D6jfiz7nVxt8RnjQytcuY9JT4F6ADhAErB0RvCBumA1dqFfU2
+q8d7fWChIlWwp/unHwMa+MLtF9Xh4WW9+hy2DsOeZiEUK/ShKwvX/KlBfQJdJfCg
+hU7f9bpNJQcE/lBFpaw82NI1MHd4H/zSMXjWiILhazNLxdsrYXbGVv+CwYsyvmKp
+f2A/NkwJad26yUG+NM55QmK/yy8AYoAm2pltHzWh8GC2EEclQ5jOkgL2MPLJUN0w
+yw3qnza8WwrFbevIgmk5q2HOpnXIauIwH1jtOwE0yHGUTV2BfgeDuL1VGr/6Jm/C
+yDS4L19gGn2n5M/1Wj+M6QINZBvWDqReHCf3mEe+LhVrqJqg+LUUNoj3FRaIeId9
+BWIZh0+v6NgADcnUdzBuvGBfgVmQXlDBETK15mAQKZrXbtZCsnPm9JRDzK5L+L35
+Bne+Ne8T0fVz4sVcs/TSN/VUehGPMe7zDvSfX47EkH424IvB2sZvqWnahYJ2q44h
+w36RpX7oADVYr+NNcn2t
+=aoKd
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-13934_13933.patch b/net-proxy/squid/files/squid-13934_13933.patch
new file mode 100644
index 000000000000..fa1d91dbbe14
--- /dev/null
+++ b/net-proxy/squid/files/squid-13934_13933.patch
@@ -0,0 +1,29 @@
+=== modified file 'helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in'
+--- helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in	2015-01-13 07:25:36 +0000
++++ helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in	2015-02-19 03:00:51 +0000
+@@ -121,6 +121,11 @@
+ #
+ use vars qw/ %opt /;
+ 
++my $user;
++my $group;
++my @groups;
++my $ans;
++
+ # Disable output buffering
+ $|=1;
+ 
+@@ -132,7 +137,11 @@
+ # Check if a user belongs to a group
+ #
+ sub check {
+-        local($user, $group) = @_;
++	my $groupSID;
++	my $groupGID;
++	my @tmpuser;
++
++	our($user, $group) = @_;
+ 	if ($opt{K} && ($user =~ m/\@/)) {
+ 		@tmpuser = split(/\@/, $user);
+ 		$user = "$tmpuser[1]\\$tmpuser[0]";
+
diff --git a/net-proxy/squid/squid-3.5.2.ebuild b/net-proxy/squid/squid-3.5.2.ebuild
new file mode 100644
index 000000000000..f532deb36c82
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.2.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.2.ebuild,v 1.1 2015/02/23 08:52:19 eras Exp $
+
+EAPI=5
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-13934_13933.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}