Remove obsolete versions.

Remove qos USE flag.
Add epoll and kqueue USE flags (#247488).
Add init script support for Kerberos keytab file (#242060).
Package-Manager: portage-2.1.4.4

15 files changed, 58 insertions, 1195 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index ed0f3a611c00..5d224ef145f8 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.212 2008/11/13 00:40:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.213 2008/11/30 19:20:44 mrness Exp $
+
+*squid-3.0.10-r1 (30 Nov 2008)
+*squid-2.7.5-r1 (30 Nov 2008)
+
+  30 Nov 2008; Alin Năstac <mrness@gentoo.org>
+  -files/squid-2.7.3-gentoo.patch, -files/squid-3.0.9-gentoo.patch,
+  -files/squid-3.0.9-heimdal.patch, -files/squid-3.0.9-zph.patch,
+  files/squid.confd, files/squid.initd, files/squid.initd-logrotate,
+  metadata.xml, -squid-2.7.3.ebuild, squid-2.7.4-r2.ebuild,
+  -squid-2.7.5.ebuild, +squid-2.7.5-r1.ebuild, -squid-3.0.9.ebuild,
+  -squid-3.0.10.ebuild, +squid-3.0.10-r1.ebuild:
+  Remove obsolete versions. Remove qos USE flag. Add epoll and kqueue USE
+  flags (#247488). Add init script support for Kerberos keytab file (#242060).
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> squid-2.7.4-r2.ebuild:
   stable ppc64, bug 242386
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 3b13af77032a..e998bb93e04a 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,4 +1,6 @@
-AUX squid-2.7.3-gentoo.patch 12128 RMD160 5cf6e9b709863c324128b49a9660e76fb22f94f6 SHA1 4778c6f8efa8e043300b59c29286b81bf020818d SHA256 a6f20ea317a7e4b4968aabeddcff0937e0372b2ed45a094284ec56b0563f7874
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2.7.4-charset.patch 806 RMD160 05148c248221d0c8994e23721f12c736d9581e11 SHA1 d052513093c8642d282863dc6a5180ff1af8bd41 SHA256 0ff6787182e61fed7438b300f9ac82432eb771d8808413a14b5aecc899841895
 AUX squid-2.7.4-gentoo.patch 12115 RMD160 bba9ad08596da94386d6096e85edbdd18179a2e8 SHA1 e3b9443b9bce5f62100c2e3b207c9eae2debfebb SHA256 cc739e81ebb8c3c28261048f19679a9d6616914718ed59e138dc954ec84d926b
 AUX squid-2.7.4-heimdal.patch 775 RMD160 0b77d87fe33cbb37eade0e4f3936bf86c1ad1287 SHA1 628a8d2dcdf2dac5bd91cae24ceff7d83ddb066c SHA256 74552d40f0b5002c76507795d278b7e2b453e46c2d3b4ef91370f2d28b92a2e9
@@ -7,24 +9,24 @@ AUX squid-2.7.5-heimdal.patch 776 RMD160 9770c48d6e1a4ac7416bfb016d081faa7de538a
 AUX squid-3.0.10-gentoo.patch 9436 RMD160 3fe79145673156bedd0e931403d9cdf1556f3f02 SHA1 240e4f784a9f8d25c7ee1263ff9017529982f6b0 SHA256 11d3ba89dbb293a650b33ddc7de0b57bede7266a25bf6ed30c557380b6372067
 AUX squid-3.0.10-heimdal.patch 780 RMD160 15712e266739437c132c281fa148e97694f78bc1 SHA1 d48af0a27a1f279332d5e75004d67e90ccc22eac SHA256 c9ebdf5ba1cd36d133adc15dfe1688955ae4d1cd5abfaccd4d4780340d05e0d7
 AUX squid-3.0.10-zph.patch 6838 RMD160 1f9537a65b12478a195dbeb3a1a6f747c648ef21 SHA1 f6065cf11036c4f1cc86cb2f427a04e302d5c4ad SHA256 35128333937b372aad27f59ee5edfada5c88b8db95dd94c9882a55aea1c3bf08
-AUX squid-3.0.9-gentoo.patch 9376 RMD160 59e279e3aaabd9fa0b5639c47ba3b19a2399f6c3 SHA1 8e4a4b836611b5eb4453a1767cd7eaa1e471e2ad SHA256 cc033d7e5c6dbed210788b7c5a59950b94da1c24d97b1aeb256be4e9da371cdf
-AUX squid-3.0.9-heimdal.patch 775 RMD160 1ffe4051674cbd40352ee663c866569d080f88a1 SHA1 881541881cd1e18108d119746835207578c44d3a SHA256 1a3a493af1aae8e3bdf37947a0e3d4f261db758fb06fc7de7251625ebb82634d
-AUX squid-3.0.9-zph.patch 6813 RMD160 43618ebdbea01ade8437189268109b1f4518c31f SHA1 92dadd97c9dce26224691c43d703e869d19320d6 SHA256 16ad6a974648a75f01fa6d8e7b854d18689e703757ec9752d9973707f7977ff4
-AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
+AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
-AUX squid.initd 2171 RMD160 f0e96395e869526a7daf5072d3ed1b2ea8e1a2b9 SHA1 aaacc2b0a879a7225db17bc725c8c028d6d393e3 SHA256 a64c0aaae506be98bcc024b9d3b3a883b1b9be91b8a73960d3a7cff445b8217f
-AUX squid.initd-logrotate 2065 RMD160 34ad950dca48d37559f81e84b82f0e9dd9c96cb1 SHA1 1d086d251e9c57634809cc39bcb901a3c4d4e4dc SHA256 2c2693b3e2fa14416523343d2d7e7b2697243c4316b586b031c0f283510dd4ba
+AUX squid.initd 2202 RMD160 bdfe34d7d4f0ab5270d2773914d6eb254b030505 SHA1 0092d4259b22c29871b78b0656f836784ec7c09d SHA256 627f30e789949a6881da1b8227cc57ff782159cf5d6c99b1ec4163cfa38636eb
+AUX squid.initd-logrotate 2095 RMD160 bdbbee1246cc59bcedcf569cfe95ff729f593120 SHA1 61f62f80d941d70f8b4094c47f02ac3a6633b9c8 SHA256 ce912903f2cb5c4d3cabc346e7fc8db205b2cabb063748528c84fefdf69dca07
 AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8b3c43c0d327150069a65aa473302ae6c423ff SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
-DIST squid-2.7.STABLE3.tar.gz 1782040 RMD160 80410ce27f3abd0601e10ab5d69099d9f3caaf28 SHA1 0c99054d5fd6537da467acbf299ffe5f1a542ae3 SHA256 d987578c6ca26ca8c8d6fad920580cc39b6ebe95c8ff727b1b6d3c5625fe428d
 DIST squid-2.7.STABLE4.tar.gz 1783318 RMD160 dcd76cf798a205ffa2c403eaadfa1dafd263ae3b SHA1 79a4b41a965985cfd5b50fc90a437c5919d4b4ed SHA256 e4d679dcb7ea56a75d57e88e64c4cd654ddb44e1fcea92af4ff02fad4cec915a
 DIST squid-2.7.STABLE5.tar.gz 1785004 RMD160 eb3375bea52ae75fbe87132abece1a5ddf76fabb SHA1 2be7b8ebeefa912d9f69889424249ae7bedd1971 SHA256 30431b9377aa99ee2fe2c7aa4160c73f680613e213ebf8c692483873ef735a18
 DIST squid-3.0.STABLE10.tar.gz 2449969 RMD160 d8d4e57365f8bab05e69805e866ab52a21c885a1 SHA1 21d2ab3f7615e9bae9190818fef65a0135fe4c7b SHA256 9538af9cd96e9aee42d33f4ceba86d7b2de3d6281b5c5a152ea8f872ed2fb6d7
-DIST squid-3.0.STABLE9.tar.gz 2449207 RMD160 70b3952979c7abf42f179a85d324709e789f5a26 SHA1 ba9656b9ffd219877238e94abc7d0dca31cc1db9 SHA256 e5f13fc00c1980f9063ebe197740beb84f6f624a191268d888672be0ef066dd4
-EBUILD squid-2.7.3.ebuild 5766 RMD160 c0327edeef69e4ac2521d56a5f51df181cc772c6 SHA1 af1824c17a22d83ed7af17ac51cd801b95eaa020 SHA256 10e32bcc84e53ca8d08a3d358b93506959bcf53ab6bc955d59e05e3a3245b5f1
-EBUILD squid-2.7.4-r2.ebuild 6316 RMD160 3c878c4cde92bb2ee95c6073e7f3bbe55e6b30fa SHA1 92b551ede5eaac28c45a46b07216c48acd2e3cb7 SHA256 459fc82506d92762d5b2bc48f45532c97156d54fea6e36472b2ad4b65cc1aa05
-EBUILD squid-2.7.5.ebuild 6280 RMD160 bf020c70a3010fe908aa443e927d89447d537efb SHA1 cf970f417f14af4d3689454eb00ced16f8c4fd2e SHA256 3e5f05c950a0e1e605a1781483cc33e33687f2f620acbae2e9fbf62e9fb202b0
-EBUILD squid-3.0.10.ebuild 6618 RMD160 f7787575e473f98e39d639d41d99f003bf5681a2 SHA1 c73054274d4d14d776e9d3bb1404fc9f907ea68c SHA256 ed6ab6dae6d6c95f308e92f8878b775e2e73183e56de595e9d646dc1f20299b0
-EBUILD squid-3.0.9.ebuild 6617 RMD160 9b159dbfed33582e3acb102ceaa3b1e9fecfcfed SHA1 a8c042cecfe2ebda35a24543a579de330a9af44e SHA256 b77087fede33571bbac8259e7f3e45a4a5e1981ad93198141f8d9d609a98d56d
-MISC ChangeLog 48208 RMD160 b155e1486e033639e89cc93d00570fbb4b99892b SHA1 82384be967ca774d05dba48a766a5aab990dcf45 SHA256 6c0fde1d3aa73568ef27a5b043158be9aee9ce3e47dabaa8082712e60689d2aa
-MISC metadata.xml 785 RMD160 e8e82152b25f16ac930d8f93a3563d6a58fdfef9 SHA1 5e343b5a7a0cc6472052190b8bdbd42539987868 SHA256 1d0379a1b9995ac6d0141a675a852f9318b3956d5c1bb19a1358fc0b08a9eeff
+EBUILD squid-2.7.4-r2.ebuild 6131 RMD160 e17de4b0cb94f08ef7f151862d36220cb2802129 SHA1 c313d0a6a3652ed00e30a2a0f5349ca029ce842e SHA256 afb3ff2c8a296c83d96efec59855faa2d3379cce4346daf584041581386e3b87
+EBUILD squid-2.7.5-r1.ebuild 6035 RMD160 4e1495e49ad82c94c305cce0f76d1125fd82685e SHA1 de6c5312c9bcbf82ff8b88f69d35cb814276d8cc SHA256 a78a791781402e8b427f973b4839b145e26dc416d7ca3eafb3509d350d7530ce
+EBUILD squid-3.0.10-r1.ebuild 6461 RMD160 95eff02b3286157c2c85d69ec75b90c5e1c7895b SHA1 830156a498d19b559b65e4f6b74926e6679e1746 SHA256 8bc115dc207f1b546b9f60053b9203d9df1c8ccda3bffb9a46f917d4c1d19c34
+MISC ChangeLog 48852 RMD160 82c1ac3c99ea00e81bb54d13b7f45aa599fc7820 SHA1 2d454fbc2b6684aa9ff956cb4daeca026ff46196 SHA256 77ea5e0e5349d78799326c5892d5fbf5417b841af3583b79768213ff60bed9cb
+MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkky55sACgkQPrHvTlXvhtu14wCeMtFC67yBCDFk2d+Xj2SU24pR
+rZwAoKimFOqN2mz3mEhxfrRkv02GI5pQ
+=kVVE
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.7.3-gentoo.patch b/net-proxy/squid/files/squid-2.7.3-gentoo.patch
deleted file mode 100644
index 688f093597a4..000000000000
--- a/net-proxy/squid/files/squid-2.7.3-gentoo.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff -Nru squid-2.7.STABLE3.orig/configure.in squid-2.7.STABLE3/configure.in
---- squid-2.7.STABLE3.orig/configure.in	2008-06-26 00:18:55.000000000 +0200
-+++ squid-2.7.STABLE3/configure.in	2008-06-26 20:37:08.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.STABLE3.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE3/helpers/basic_auth/MSNT/confload.c
---- squid-2.7.STABLE3.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 21:09:48.000000000 +0200
-+++ squid-2.7.STABLE3/helpers/basic_auth/MSNT/confload.c	2008-06-26 20:37:08.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.STABLE3.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE3/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-2.7.STABLE3.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 20:44:28.000000000 +0200
-+++ squid-2.7.STABLE3/helpers/basic_auth/MSNT/msntauth.conf.default	2008-06-26 20:37:08.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.STABLE3.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE3/helpers/basic_auth/SMB/Makefile.am
---- squid-2.7.STABLE3.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 18:56:26.000000000 +0200
-+++ squid-2.7.STABLE3/helpers/basic_auth/SMB/Makefile.am	2008-06-26 20:37:08.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.STABLE3.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE3/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.7.STABLE3.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 00:36:46.000000000 +0100
-+++ squid-2.7.STABLE3/helpers/basic_auth/SMB/smb_auth.sh	2008-06-26 20:37:08.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.STABLE3.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE3/helpers/external_acl/session/squid_session.8
---- squid-2.7.STABLE3.orig/helpers/external_acl/session/squid_session.8	2007-01-06 18:28:35.000000000 +0100
-+++ squid-2.7.STABLE3/helpers/external_acl/session/squid_session.8	2008-06-26 20:37:08.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.STABLE3.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE3/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-2.7.STABLE3.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 17:07:24.000000000 +0200
-+++ squid-2.7.STABLE3/helpers/external_acl/unix_group/squid_unix_group.8	2008-06-26 20:37:08.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.STABLE3.orig/src/access_log.c squid-2.7.STABLE3/src/access_log.c
---- squid-2.7.STABLE3.orig/src/access_log.c	2008-03-18 03:48:43.000000000 +0100
-+++ squid-2.7.STABLE3/src/access_log.c	2008-06-26 20:37:08.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.STABLE3.orig/src/cf.data.pre squid-2.7.STABLE3/src/cf.data.pre
---- squid-2.7.STABLE3.orig/src/cf.data.pre	2008-06-25 00:54:18.000000000 +0200
-+++ squid-2.7.STABLE3/src/cf.data.pre	2008-06-26 20:37:08.000000000 +0200
-@@ -676,6 +676,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
-@@ -709,6 +711,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
-@@ -726,6 +731,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
-@@ -3720,11 +3728,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
-@@ -3753,12 +3761,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
-@@ -4395,12 +4403,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
-@@ -4471,12 +4479,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
-@@ -5373,6 +5381,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.STABLE3.orig/src/client_side.c squid-2.7.STABLE3/src/client_side.c
---- squid-2.7.STABLE3.orig/src/client_side.c	2008-06-25 00:54:47.000000000 +0200
-+++ squid-2.7.STABLE3/src/client_side.c	2008-06-26 20:37:08.000000000 +0200
-@@ -4678,14 +4678,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.STABLE3.orig/src/defines.h squid-2.7.STABLE3/src/defines.h
---- squid-2.7.STABLE3.orig/src/defines.h	2007-09-24 15:31:19.000000000 +0200
-+++ squid-2.7.STABLE3/src/defines.h	2008-06-26 20:37:08.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.STABLE3.orig/src/main.c squid-2.7.STABLE3/src/main.c
---- squid-2.7.STABLE3.orig/src/main.c	2008-05-27 01:14:30.000000000 +0200
-+++ squid-2.7.STABLE3/src/main.c	2008-06-26 20:37:08.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)
- {
-@@ -613,7 +629,7 @@
- 
-     if (!configured_once) {
- #if USE_UNLINKD
--	unlinkdInit();
-+	if (needUnlinkd()) unlinkdInit();
- #endif
- 	urlInitialize();
- 	cachemgrInit();
-@@ -636,6 +652,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.STABLE3.orig/src/Makefile.am squid-2.7.STABLE3/src/Makefile.am
---- squid-2.7.STABLE3.orig/src/Makefile.am	2008-01-02 16:50:39.000000000 +0100
-+++ squid-2.7.STABLE3/src/Makefile.am	2008-06-26 20:37:08.000000000 +0200
-@@ -340,13 +340,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.0.9-gentoo.patch b/net-proxy/squid/files/squid-3.0.9-gentoo.patch
deleted file mode 100644
index 9ee2886268e5..000000000000
--- a/net-proxy/squid/files/squid-3.0.9-gentoo.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -ru squid-3.0.STABLE9.orig/configure.in squid-3.0.STABLE9/configure.in
---- squid-3.0.STABLE9.orig/configure.in	2008-09-09 16:06:45.000000000 +0000
-+++ squid-3.0.STABLE9/configure.in	2008-09-14 07:35:54.000000000 +0000
-@@ -19,9 +19,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 -ru squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE9/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/confload.c	2008-09-09 16:06:40.000000000 +0000
-+++ squid-3.0.STABLE9/helpers/basic_auth/MSNT/confload.c	2008-09-14 07:35:54.000000000 +0000
-@@ -27,7 +27,7 @@
- 
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
- 
-diff -ru squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-09-09 16:06:40.000000000 +0000
-+++ squid-3.0.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default	2008-09-14 07:35:54.000000000 +0000
-@@ -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 -ru squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE9/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am	2008-09-09 16:06:40.000000000 +0000
-+++ squid-3.0.STABLE9/helpers/basic_auth/SMB/Makefile.am	2008-09-14 07:35:54.000000000 +0000
-@@ -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 -ru squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE9/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-09-09 16:06:40.000000000 +0000
-+++ squid-3.0.STABLE9/helpers/basic_auth/SMB/smb_auth.sh	2008-09-14 07:35:54.000000000 +0000
-@@ -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 -ru squid-3.0.STABLE9.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE9/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE9.orig/helpers/external_acl/session/squid_session.8	2008-09-09 16:06:41.000000000 +0000
-+++ squid-3.0.STABLE9/helpers/external_acl/session/squid_session.8	2008-09-14 07:35:54.000000000 +0000
-@@ -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 -ru squid-3.0.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-09-09 16:06:41.000000000 +0000
-+++ squid-3.0.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8	2008-09-14 07:35:54.000000000 +0000
-@@ -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 -ru squid-3.0.STABLE9.orig/src/cf.data.pre squid-3.0.STABLE9/src/cf.data.pre
---- squid-3.0.STABLE9.orig/src/cf.data.pre	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/cf.data.pre	2008-09-14 07:35:54.000000000 +0000
-@@ -652,6 +652,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
-@@ -685,6 +687,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
-@@ -702,6 +707,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
-@@ -3254,11 +3262,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
-@@ -5208,6 +5216,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 -ru squid-3.0.STABLE9.orig/src/debug.cc squid-3.0.STABLE9/src/debug.cc
---- squid-3.0.STABLE9.orig/src/debug.cc	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/debug.cc	2008-09-14 07:35:54.000000000 +0000
-@@ -465,7 +465,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (opt_syslog_enable)
--        openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+        openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
- 
- #endif /* HAVE_SYSLOG */
- 
-diff -ru squid-3.0.STABLE9.orig/src/defines.h squid-3.0.STABLE9/src/defines.h
---- squid-3.0.STABLE9.orig/src/defines.h	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/defines.h	2008-09-14 07:35:54.000000000 +0000
-@@ -219,7 +219,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
- 
- /* handy to determine the #elements in a static array */
-diff -ru squid-3.0.STABLE9.orig/src/main.cc squid-3.0.STABLE9/src/main.cc
---- squid-3.0.STABLE9.orig/src/main.cc	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/main.cc	2008-09-14 07:35:54.000000000 +0000
-@@ -1486,7 +1486,7 @@
-     if (*(argv[0]) == '(')
-         return;
- 
--    openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-     if ((pid = fork()) < 0)
-         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1530,7 +1530,7 @@
- 
-         if ((pid = fork()) == 0) {
-             /* child */
--            openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+            openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-             prog = xstrdup(argv[0]);
-             argv[0] = xstrdup("(squid)");
-             execvp(prog, argv);
-@@ -1538,7 +1538,7 @@
-         }
- 
-         /* parent */
--        openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-         syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
- 
-diff -ru squid-3.0.STABLE9.orig/src/Makefile.am squid-3.0.STABLE9/src/Makefile.am
---- squid-3.0.STABLE9.orig/src/Makefile.am	2008-09-09 16:06:43.000000000 +0000
-+++ squid-3.0.STABLE9/src/Makefile.am	2008-09-14 07:35:54.000000000 +0000
-@@ -992,12 +992,12 @@
- 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_SWAP_DIR        = $(localstatedir)/cache
-+DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
-+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 | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.0.9-heimdal.patch b/net-proxy/squid/files/squid-3.0.9-heimdal.patch
deleted file mode 100644
index f2fd39fe1121..000000000000
--- a/net-proxy/squid/files/squid-3.0.9-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru squid-3.0.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-3.0.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-17 15:43:40.000000000 +0200
-+++ squid-3.0.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-17 15:57:02.000000000 +0200
-@@ -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-3.0.9-zph.patch b/net-proxy/squid/files/squid-3.0.9-zph.patch
deleted file mode 100644
index 5a1ea96ca198..000000000000
--- a/net-proxy/squid/files/squid-3.0.9-zph.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -ru squid-3.0.STABLE9.orig/src/cf.data.pre squid-3.0.STABLE9/src/cf.data.pre
---- squid-3.0.STABLE9.orig/src/cf.data.pre	2008-09-14 07:38:23.000000000 +0000
-+++ squid-3.0.STABLE9/src/cf.data.pre	2008-09-14 07:44:46.000000000 +0000
-@@ -1127,6 +1127,60 @@
- 	making the request.
- DOC_END
- 
-+NAME: zph_tos_local
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_local
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark local hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_peer
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_peer
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark peer hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_parent
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_tos_parent
-+DEFAULT: on
-+DOC_START
-+       Set this to off if you want only sibling hits to be marked.
-+       If set to on (default), parent hits are being marked too.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_preserve_miss_tos
-+DEFAULT: on
-+DOC_START
-+       If set to on (default), any HTTP response towards clients will
-+       have the TOS value of the response comming from the remote
-+       server masked with the value of zph_preserve_miss_tos_mask.
-+       For this to work correctly, you will need to patch your linux
-+       kernel with the TOS preserving ZPH patch.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos_mask
-+TYPE: int
-+DEFAULT: 255
-+LOC: Config.zph_preserve_miss_tos_mask
-+DOC_START
-+       Allows you to mask certain bits in the TOS received from the
-+       remote server, before copying the value to the TOS send towards
-+       clients.
-+       Default: 255 (TOS from server is not changed).
-+DOC_END
-+
- NAME: tcp_outgoing_address
- TYPE: acl_address
- DEFAULT: none
-diff -ru squid-3.0.STABLE9.orig/src/client_side_reply.cc squid-3.0.STABLE9/src/client_side_reply.cc
---- squid-3.0.STABLE9.orig/src/client_side_reply.cc	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/client_side_reply.cc	2008-09-14 07:44:46.000000000 +0000
-@@ -48,6 +48,7 @@
- #include "ESI.h"
- #endif
- #include "MemObject.h"
-+#include "fde.h"
- #include "ACLChecklist.h"
- #include "ACL.h"
- #if DELAY_POOLS
-@@ -1548,6 +1549,11 @@
-         /* guarantee nothing has been sent yet! */
-         assert(http->out.size == 0);
-         assert(http->out.offset == 0);
-+        if (Config.zph_tos_local)
-+      	{
-+			debugs(33, 1, "ZPH hit hier.code=" << http->request->hier.code <<" TOS="<<Config.zph_tos_local);
-+	    	comm_set_tos(http->getConn()->fd,Config.zph_tos_local);
-+      	}             
-         tempBuffer.offset = reqofs;
-         tempBuffer.length = getNextNode()->readBuffer.length;
-         tempBuffer.data = getNextNode()->readBuffer.data;
-@@ -1827,6 +1833,24 @@
-     char *buf = next()->readBuffer.data;
- 
-     char *body_buf = buf;
-+    
-+    if (reqofs==0 && !logTypeIsATcpHit(http->logType))
-+    {
-+		int tos = 0;
-+		if (Config.zph_tos_peer && 

-+    	 	 (http->request->hier.code==SIBLING_HIT ||

-+			 Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT))
-+		{
-+			tos = Config.zph_tos_peer;
-+			debugs(33, 1, "ZPH: Peer hit, TOS="<<tos<<" hier.code="<<http->request->hier.code);
-+		}
-+		else if (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
-+		{
-+			tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
-+			debugs(33, 1, "ZPH: Preserving TOS on miss, TOS="<<tos);
-+		}
-+		comm_set_tos(fd,tos);
-+    }     
- 
-     if (buf != result.data) {
-         /* we've got to copy some data */
-diff -ru squid-3.0.STABLE9.orig/src/fde.h squid-3.0.STABLE9/src/fde.h
---- squid-3.0.STABLE9.orig/src/fde.h	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/fde.h	2008-09-14 07:44:46.000000000 +0000
-@@ -106,7 +106,7 @@
-         long handle;
-     } win32;
- #endif
--
-+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
- };
- 
- #endif /* SQUID_FDE_H */
-diff -ru squid-3.0.STABLE9.orig/src/forward.cc squid-3.0.STABLE9/src/forward.cc
---- squid-3.0.STABLE9.orig/src/forward.cc	2008-09-09 16:06:44.000000000 +0000
-+++ squid-3.0.STABLE9/src/forward.cc	2008-09-14 07:44:46.000000000 +0000
-@@ -964,6 +964,52 @@
- 
-     netdbPingSite(request->host);
- 
-+    /* Retrieves remote server TOS value, and stores it as part of the
-+     * original client request FD object. It is later used to forward
-+     * remote server's TOS in the response to the client in case of a MISS.
-+     */
-+	fde * clientFde = &fd_table[client_fd];
-+	if (clientFde)
-+	{
-+		int tos = 1;
-+		int tos_len = sizeof(tos);
-+		clientFde->upstreamTOS = 0;
-+	    if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
-+	    {
-+	       unsigned char buf[512];
-+	       int len = 512;
-+	       if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
-+	       {
-+	           /* Parse the PKTOPTIONS structure to locate the TOS data message
-+	            * prepared in the kernel by the ZPH incoming TCP TOS preserving
-+	            * patch.
-+	            */
-+	    	   unsigned char * p = buf;
-+	           while (p-buf < len)
-+	           {
-+	              struct cmsghdr *o = (struct cmsghdr*)p;
-+	              if (o->cmsg_len<=0)
-+	                 break;
-+	
-+	              if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
-+	              {
-+	            	  clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
-+	            	  break;
-+	              }
-+	              p += CMSG_LEN(o->cmsg_len);
-+	           }
-+	       }
-+	       else
-+	       {
-+	           debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
-+	       }
-+	    }
-+	    else
-+	    {
-+	    	debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
-+	    }
-+	}    
-+
-     if (servers && (p = servers->_peer)) {
-         p->stats.fetches++;
-         request->peer_login = p->login;
-diff -ru squid-3.0.STABLE9.orig/src/structs.h squid-3.0.STABLE9/src/structs.h
---- squid-3.0.STABLE9.orig/src/structs.h	2008-09-09 16:06:45.000000000 +0000
-+++ squid-3.0.STABLE9/src/structs.h	2008-09-14 07:44:46.000000000 +0000
-@@ -553,6 +553,8 @@
-         int emailErrData;
-         int httpd_suppress_version_string;
-         int global_internal_static;
-+        int zph_tos_parent;
-+        int zph_preserve_miss_tos;
-         int debug_override_X;
-         int WIN32_IpAddrChangeMonitor;
-     }
-@@ -721,6 +723,9 @@
-     int sleep_after_fork;	/* microseconds */
-     time_t minimum_expiry_time;	/* seconds */
-     external_acl *externalAclHelperList;
-+    int zph_tos_local;
-+    int zph_tos_peer;
-+    int zph_preserve_miss_tos_mask;
- #if USE_SSL
- 
-     struct
diff --git a/net-proxy/squid/files/squid.confd b/net-proxy/squid/files/squid.confd
index 75cebd0abab1..a27ecd388f0e 100644
--- a/net-proxy/squid/files/squid.confd
+++ b/net-proxy/squid/files/squid.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.1 2005/04/22 19:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.2 2008/11/30 19:20:44 mrness Exp $
 
 # Config file for /etc/init.d/squid
 
@@ -9,3 +9,6 @@ SQUID_OPTS="-DYC"
 # Max. number of filedescriptors to use. You can increase this on a busy
 # cache to a maximum of (currently) 8192 filedescriptors. Default is 1024.
 SQUID_MAXFD=1024
+
+# Kerberos keytab file to use. This is required if you enable kerberos authentication.
+SQUID_KEYTAB=""
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index 0cdaad8540fa..2c6b36f9f21a 100644
--- a/net-proxy/squid/files/squid.initd
+++ b/net-proxy/squid/files/squid.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 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.9 2008/04/14 05:45:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $
 
 opts="${opts} reload rotate"
 
@@ -53,7 +53,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting squid"
-	/usr/sbin/squid ${SQUID_OPTS}
+	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS}
 	eend $? && sleep 1
 }
 
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
index e1062981546f..6c3e719e85f1 100644
--- a/net-proxy/squid/files/squid.initd-logrotate
+++ b/net-proxy/squid/files/squid.initd-logrotate
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 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.7 2008/04/14 05:45:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.8 2008/11/30 19:20:44 mrness Exp $
 
 opts="${opts} reload"
 
@@ -53,7 +53,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting squid"
-	/usr/sbin/squid ${SQUID_OPTS}
+	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS}
 	eend $? && sleep 1
 }
 
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index f9116570da54..6a5da19f93ab 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -4,15 +4,15 @@
 <herd>net-proxy</herd>
 <longdescription>A full-featured web proxy cache</longdescription>
 <use>
+	<flag name='epoll'>Enables Linux epoll() support</flag>
 	<flag name='icap-client'>Adds ICAP client support</flag>
 	<flag name='ipf-transparent'>Adds transparent proxy support for systems
 		using IP-Filter (only for *bsd)</flag>
 	<flag name='logrotate'>Use <pkg>app-admin/logrotate</pkg> for rotating
 		logs</flag>
+	<flag name='kqueue'>Enables *BSD kqueue() support</flag>
 	<flag name='pf-transparent'>Adds transparent proxy support for systems using
 		PF (only for *bsd)</flag>
-	<flag name='qos'>Adds tcp_outgoing_priority for setting the Qdisc
-		priority</flag>
 	<flag name='zero-penalty-hit'>Add Zero Penalty Hit patch
 		(http://zph.bratcheda.org)</flag>
 </use>
diff --git a/net-proxy/squid/squid-2.7.3.ebuild b/net-proxy/squid/squid-2.7.3.ebuild
deleted file mode 100644
index 0185b227b70b..000000000000
--- a/net-proxy/squid/squid-2.7.3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.3.ebuild,v 1.6 2008/08/14 17:12:26 nixnut Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils pam toolchain-funcs autotools linux-info
-
-#lame archive versioning scheme..
-S_PMV="${PV%%.*}"
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate \
-	qos zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	if use qos; then
-		eerror "qos patch is no longer supported!"
-		eerror "Please remove qos USE flag and use zph* config options instead."
-		die "unsupported USE flags detected"
-	fi
-	if use zero-penalty-hit; then
-		ewarn "This version supports natively IP TOS/Priority mangling,"
-		ewarn "but it does not support zph_preserve_miss_tos."
-		ewarn "If you need that, please use squid-3.0.6-r2 or higher."
-	fi
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-
-	cd "${S}" || die "source dir not found"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_compile() {
-	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}"
-
-	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,${ntlm_helpers}"
-
-	local myconf=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-		if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then
-			myconf="${myconf} --enable-epoll"
-		fi
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --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 \
-		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		--with-maxfd=8192 \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	# 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
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}
diff --git a/net-proxy/squid/squid-2.7.4-r2.ebuild b/net-proxy/squid/squid-2.7.4-r2.ebuild
index 1d8bf04834ff..16227b439bf6 100644
--- a/net-proxy/squid/squid-2.7.4-r2.ebuild
+++ b/net-proxy/squid/squid-2.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.4-r2.ebuild,v 1.8 2008/11/13 00:40:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.4-r2.ebuild,v 1.9 2008/11/30 19:20:44 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
 	mysql postgres sqlite \
-	qos zero-penalty-hit \
+	zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux"
 
@@ -45,11 +45,6 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${S_PP}"
 
 pkg_setup() {
-	if use qos; then
-		eerror "qos patch is no longer supported!"
-		eerror "Please remove qos USE flag and use zph* config options instead."
-		die "unsupported USE flags detected"
-	fi
 	if use zero-penalty-hit; then
 		ewarn "This version supports natively IP TOS/Priority mangling,"
 		ewarn "but it does not support zph_preserve_miss_tos."
diff --git a/net-proxy/squid/squid-2.7.5.ebuild b/net-proxy/squid/squid-2.7.5-r1.ebuild
index 01f66c60d521..1f7edbd82317 100644
--- a/net-proxy/squid/squid-2.7.5.ebuild
+++ b/net-proxy/squid/squid-2.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.5.ebuild,v 1.1 2008/10/19 10:00:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.5-r1.ebuild,v 1.1 2008/11/30 19:20:44 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -23,9 +23,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
 	mysql postgres sqlite \
-	qos zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux"
+	zero-penalty-hit \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux epoll"
 
 DEPEND="pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
@@ -45,11 +45,6 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${S_PP}"
 
 pkg_setup() {
-	if use qos; then
-		eerror "qos patch is no longer supported!"
-		eerror "Please remove qos USE flag and use zph* config options instead."
-		die "unsupported USE flags detected"
-	fi
 	if use zero-penalty-hit; then
 		ewarn "This version supports natively IP TOS/Priority mangling,"
 		ewarn "but it does not support zph_preserve_miss_tos."
@@ -101,12 +96,10 @@ src_compile() {
 	fi
 
 	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-		if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then
-			myconf="${myconf} --enable-epoll"
-		fi
+		myconf="${myconf} --enable-linux-netfilter
+			$(use_enable epoll)"
 	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
+		myconf="${myconf} $(use_enable kqueue)"
 		if use pf-transparent; then
 			myconf="${myconf} --enable-pf-transparent"
 		elif use ipf-transparent; then
diff --git a/net-proxy/squid/squid-3.0.9.ebuild b/net-proxy/squid/squid-3.0.10-r1.ebuild
index 082277c04412..e404146b3fab 100644
--- a/net-proxy/squid/squid-3.0.9.ebuild
+++ b/net-proxy/squid/squid-3.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.9.ebuild,v 1.3 2008/10/17 20:19:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.10-r1.ebuild,v 1.1 2008/11/30 19:20:44 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -24,9 +24,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 -arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
 	mysql postgres sqlite \
-	qos zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux"
+	zero-penalty-hit \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux epoll"
 
 DEPEND="pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
@@ -54,11 +54,6 @@ pkg_setup() {
 		die "/etc/squid/squid.conf: cache_dir use a disabled store type"
 	fi
 
-	if use qos; then
-		eerror "qos patch is no longer supported by us!"
-		eerror "Please remove qos from your USE and select zero-penalty-hit flag instead."
-		die "unsupported USE flags detected"
-	fi
 	enewgroup squid 31
 	enewuser squid 31 -1 /var/cache/squid squid
 }
@@ -103,9 +98,10 @@ src_compile() {
 	myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
 
 	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
+		myconf="${myconf} --enable-linux-netfilter
+			$(use_enable epoll)"
 	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
+		myconf="${myconf} $(use_enable kqueue)"
 		if use pf-transparent; then
 			myconf="${myconf} --enable-pf-transparent"
 		elif use ipf-transparent; then
diff --git a/net-proxy/squid/squid-3.0.10.ebuild b/net-proxy/squid/squid-3.0.10.ebuild
deleted file mode 100644
index f220949c2638..000000000000
--- a/net-proxy/squid/squid-3.0.10.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.10.ebuild,v 1.1 2008/11/02 10:10:10 mrness Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils pam toolchain-funcs autotools linux-info
-
-# lame archive versioning scheme..
-S_PMV="${PV%%.*}"
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-RESTRICT="test" # check if test works in next bump
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 -arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
-	mysql postgres sqlite \
-	qos zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	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 use a disabled store type"
-	fi
-
-	if use qos; then
-		eerror "qos patch is no longer supported by us!"
-		eerror "Please remove qos from your USE and select zero-penalty-hit flag instead."
-		die "unsupported USE flags detected"
-	fi
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-
-	cd "${S}" || die "source dir not found"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-zph.patch
-	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	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 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,${ntlm_helpers}"
-
-	local negotiate_helpers=
-	use kerberos && local negotiate_helpers="squid_kerb_auth"
-
-	local myconf=""
-
-	# 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,null"
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --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 \
-		--datadir=/usr/share/squid \
-		--with-default-user=squid \
-		--enable-auth="basic,digest,negotiate,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--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 \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	# 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
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-	if use zero-penalty-hit; then
-		echo
-		ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
-		ewarn "with the patch that can be found on http://zph.bratcheda.org site."
-	fi
-}