Version bump (#268808).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

9 files changed, 589 insertions, 202 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 7b048af4629d..6cfa033824bc 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.245 2009/05/02 15:11:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.246 2009/05/09 08:49:09 mrness Exp $
+
+*squid-3.0.15 (09 May 2009)
+
+  09 May 2009; Alin Năstac <mrness@gentoo.org>
+  +files/squid-3.0.15-adapted-zph.patch,
+  +files/squid-3.0.15-cross-compile.patch, +files/squid-3.0.15-gcc43.patch,
+  +files/squid-3.0.15-gentoo.patch, +files/squid-3.0.15-heimdal.patch,
+  -squid-3.0.14.ebuild, -squid-3.0.14-r1.ebuild, +squid-3.0.15.ebuild:
+  Version bump (#268808).
 
 *squid-3.0.14-r2 (02 May 2009)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index ae5d3648b362..913775e73b27 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -12,6 +12,11 @@ AUX squid-3.0.14-gcc43.patch 901 RMD160 6ac1b123a79a205f5b2834c472ae02a8db325eb4
 AUX squid-3.0.14-gentoo.patch 13095 RMD160 3fb7fb0cfa72ce0f5c25a534731df841564b92d7 SHA1 bb16e7df13eca291dc44bc48f369d1d06d24739d SHA256 db037b0b00e7cb982e487b45cda9918f080c87a68d8f51650968dfdf7cc4404d
 AUX squid-3.0.14-heimdal.patch 780 RMD160 5f8727ac2033c742a373b03baf32d3e53fc13cb0 SHA1 e85bcd323c349cd85d06ca548316228d06eac6ae SHA256 2c7fcf12d94161dfe6aa441d0f85f435940c78467f3c148b0c8b04369700f6e0
 AUX squid-3.0.14-max-forwards.patch 684 RMD160 d8e778f65d448db06aff418c31cc294ef3f48121 SHA1 dedeea6d72de7ffa21b458650a1ccdbb62d5e14e SHA256 a05236fc23340df65841eb678f0b3c47526e31a2c32c4aedf564951110c2e4ea
+AUX squid-3.0.15-adapted-zph.patch 6838 RMD160 b48cb4dddddcd4fe77fa2a4878689d5e6bad8b0c SHA1 6de99b17fa9ed55188b789d09f15e1cd9c7e6e03 SHA256 5da193601eb4a2cfde0e5118cc083ff977d1932b76badc8b935358466dea44a7
+AUX squid-3.0.15-cross-compile.patch 1234 RMD160 7e85617679c73cbe70c0992f5321304be74e59a1 SHA1 23a0eecc838ab7ee7c0acc5e5a5a1a1a95fbb7ad SHA256 315d5e6bbbf1a6868a1e09fe60697d5245cfb55356ac14c2fcfd3c91d8aab5ab
+AUX squid-3.0.15-gcc43.patch 450 RMD160 239536fc33194fccbdbdb827668eb31e4d158439 SHA1 bb597c111f17e64bec7aef38c01f7a638aaf5182 SHA256 44c9f6d3fe22bd6aeb8e18d4b81b2d38d6c049150d1bf4961c504c811c5ac7ba
+AUX squid-3.0.15-gentoo.patch 13095 RMD160 f4da4b4301dc1fb919f5d4d4798acfdcc261be76 SHA1 1441d546094631bf2f69571570afc980884324e8 SHA256 0c1ddfaf33b956e33271d4cdf86411d78d5d342a5fe339b931bcd1ca130e0db1
+AUX squid-3.0.15-heimdal.patch 780 RMD160 29d0867ff851083facaf641c297e823e687790cb SHA1 b992c97cc0418486ccd9484d55d8c556015954b5 SHA256 cea54706c71b32de608e9d733b185cf55e9468f114514ecdc228e6246dce6a83
 AUX squid-3.1.0.7_beta-gentoo.patch 13196 RMD160 b9637d05f7ee6aa5b938ed9a4f83171a6ba62f10 SHA1 d3dc845247d7408e0d7e2aea9c2b60c5fa85abe4 SHA256 ea185f7571b3e45353c69f728e2b8244c35348809860f7bc76675b8a49948b0d
 AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
@@ -23,19 +28,19 @@ DIST squid-2.7.STABLE6.tar.gz 1786189 RMD160 ca59583e9d938c3184a306984f034553f76
 DIST squid-3.0.14-chunk-encoding.patch.gz 7342 RMD160 c4943c2223858b209a294903917e720a4f328ab5 SHA1 ae2e280e66f44bedce1a3b4e45a62615e8b64eae SHA256 a254c0a9d802daacd159512baab98a6f6c5a3b1d6876141f23b6395e79b5f3ac
 DIST squid-3.0.STABLE13.tar.gz 2454967 RMD160 8da76671013bf4100cbc4c2976e228f81323344e SHA1 6f0f1079a027c64a9f95b7b6c9bdd943af28a42e SHA256 8764fe16c8873bcc5c0c7e5f97b22e70dec186d1182ca4803ec94761bac750e1
 DIST squid-3.0.STABLE14.tar.gz 2456387 RMD160 eebdf3083e8018ded08861e72ee46cb32ba33ef6 SHA1 c073feeb3b94972523756f8f69cd1df09f3918a9 SHA256 9e5f8f5456e98d82dc4c5fcbcf50745a36b9860fc553cf2719f02d423e535712
+DIST squid-3.0.STABLE15.tar.gz 2441793 RMD160 35a8715928ba916a448df9331bfb0c99feb85523 SHA1 31c1eac13c8ca3d98ccbd8f4b04f1aeb26bde433 SHA256 cdf5453dbe62a9250f90fce2770322d6b0d0c50d0a365a018d17e00383d14544
 DIST squid-3.1.0.7.tar.gz 3051051 RMD160 9522e64a78bc19a07cff79109da6b8d99f4fada6 SHA1 eff28b0c5600d07938882013021f1707f58162ae SHA256 57c4c7edfe2b87f2b62b5c53521429857d68289a2abeda30adbbe59fd5a748f7
 EBUILD squid-2.7.6-r1.ebuild 6035 RMD160 d8e122044369f95f0bc78c4a55f3dee7856ed19b SHA1 207ab5cf19baf09ee564130043297caf342e0bdc SHA256 843fb7102323f83948856c8395d62affbf41dfdf2d7e0cef4828202f8f6d04c2
 EBUILD squid-3.0.13.ebuild 6458 RMD160 d3ca104a621de1e4f435bf8ca74c50f130210710 SHA1 f2ee7dcd7269d5024b1e1c82ea4341336a7e9766 SHA256 0606094713ec67bbbdbd37592f28d5babde42a93c8be76e1d20487afe296bbc2
-EBUILD squid-3.0.14-r1.ebuild 6507 RMD160 311175a0fedbb372323b36bcde6bb4895ebb1fbc SHA1 9dbd0f709046c7e17055a4e9d0eea57c1a39a91b SHA256 16140e31e21f9ec319792ae4ae0637384e0c8752209546f603d68b92d85a0718
 EBUILD squid-3.0.14-r2.ebuild 6600 RMD160 860c318a168a213d92d9023ab98019000d1b10df SHA1 b281ff139d4f5d324d0af1ab2a25f31a8737591a SHA256 fb6f3b96ca7f4613f6dba23cdbf4b168ef2baf97a74c292f10c0d8020d5a1592
-EBUILD squid-3.0.14.ebuild 6372 RMD160 3ab628eb06cf23bfc84670e70e32bf6945687847 SHA1 dcbe958c5d77b334b855d69a17478e1437e84057 SHA256 d306bfbf8f583c027859462e1e46d814b6fafc81bd4d355005be2c2f5dffec33
+EBUILD squid-3.0.15.ebuild 6567 RMD160 db3ba676fa82626665140cdc7f3f5824387889c2 SHA1 47b0fbb3e353214c390f50a4d8afd10c4ca4ab79 SHA256 2f95cdec153311ca645b72af7649fa1068448a58b25d8db0bd7db0b7c33de4e1
 EBUILD squid-3.1.0.7_beta.ebuild 6670 RMD160 b5e5559f18cf8bc7bceb2e42da18292144c2812f SHA1 3fde84f934e39de9da3439150f328766b59dbf82 SHA256 d835f68ff9f455bee6370380ac4114a4859b9012933f86245c7f3dbbf583bfb5
-MISC ChangeLog 53782 RMD160 4ed21ccce4527be0bd55f36d020fb55e0918c070 SHA1 2eaaa321ed97ecfce5b1fa6e7a14a4c4acdd0064 SHA256 0ed062a9547dc8bdb7e712eda09fcef9e1f904cb417a82c95dace4ef35bccdf4
+MISC ChangeLog 54145 RMD160 a6372085fffb480e06d2fb861d2c2d06c3dd8806 SHA1 d78bfd63b6cfa5dc0c006bf62269350ed4d8d421 SHA256 04d9d650aff9f49d8392623399dafd044d19aa69daa71e8c67a0ef2b0d88afa7
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkn8YqMACgkQts85UDFmaOV9aQCdGZntEXZIupyHWan73tMqbLWU
-PCoAn1lRPR4krnduPK81eywJSUGshrXn
-=mXO6
+iEYEARECAAYFAkoFX68ACgkQts85UDFmaOW8TQCeJyvjvBHsg/u6F2pyK19vgzM6
+4MsAn3Gl/8RNN4bKbVq1ousb+JRsrUJ2
+=CXLn
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.0.15-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.15-adapted-zph.patch
new file mode 100644
index 000000000000..864944a4daf9
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.15-adapted-zph.patch
@@ -0,0 +1,202 @@
+diff -Nru squid-3.0.STABLE15.orig/src/cf.data.pre squid-3.0.STABLE15/src/cf.data.pre
+--- squid-3.0.STABLE15.orig/src/cf.data.pre	2009-05-09 10:05:05.000000000 +0000
++++ squid-3.0.STABLE15/src/cf.data.pre	2009-05-09 10:13:39.000000000 +0000
+@@ -1133,6 +1133,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 -Nru squid-3.0.STABLE15.orig/src/client_side_reply.cc squid-3.0.STABLE15/src/client_side_reply.cc
+--- squid-3.0.STABLE15.orig/src/client_side_reply.cc	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/client_side_reply.cc	2009-05-09 10:13:39.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
+@@ -1550,6 +1551,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;
+@@ -1829,6 +1835,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 -Nru squid-3.0.STABLE15.orig/src/fde.h squid-3.0.STABLE15/src/fde.h
+--- squid-3.0.STABLE15.orig/src/fde.h	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/fde.h	2009-05-09 10:13:39.000000000 +0000
+@@ -106,7 +106,7 @@
+         long handle;
+     } win32;
+ #endif
+-
++    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
+ };
+ 
+ #endif /* SQUID_FDE_H */
+diff -Nru squid-3.0.STABLE15.orig/src/forward.cc squid-3.0.STABLE15/src/forward.cc
+--- squid-3.0.STABLE15.orig/src/forward.cc	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/forward.cc	2009-05-09 10:13:39.000000000 +0000
+@@ -965,6 +965,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 -Nru squid-3.0.STABLE15.orig/src/structs.h squid-3.0.STABLE15/src/structs.h
+--- squid-3.0.STABLE15.orig/src/structs.h	2009-05-09 10:05:06.000000000 +0000
++++ squid-3.0.STABLE15/src/structs.h	2009-05-09 10:13:39.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-3.0.15-cross-compile.patch b/net-proxy/squid/files/squid-3.0.15-cross-compile.patch
new file mode 100644
index 000000000000..68a3fb55e321
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.15-cross-compile.patch
@@ -0,0 +1,38 @@
+diff -Nru squid-3.0.STABLE15.orig/configure.in squid-3.0.STABLE15/configure.in
+--- squid-3.0.STABLE15.orig/configure.in	2009-05-09 10:02:38.000000000 +0000
++++ squid-3.0.STABLE15/configure.in	2009-05-09 10:03:20.000000000 +0000
+@@ -1820,6 +1820,10 @@
+ 	;;
+ esac
+ 
++dnl Define HOSTCXX
++HOSTCXX="$build-g++"
++AC_SUBST(HOSTCXX)
++
+ dnl Check for programs
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+diff -Nru squid-3.0.STABLE15.orig/src/Makefile.am squid-3.0.STABLE15/src/Makefile.am
+--- squid-3.0.STABLE15.orig/src/Makefile.am	2009-05-09 10:02:38.000000000 +0000
++++ squid-3.0.STABLE15/src/Makefile.am	2009-05-09 10:03:20.000000000 +0000
+@@ -1007,6 +1007,8 @@
+ 
+ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
+ 
++HOSTCXX ?= @HOSTCXX@
++
+ $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
+ 
+ snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
+@@ -1030,6 +1032,11 @@
+ squid.conf.default: cf_parser.h
+ 	true
+ 
++cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
++	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
++		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
++		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
++
+ cf_parser.h: cf.data cf_gen$(EXEEXT)
+ 	./cf_gen cf.data $(srcdir)/cf.data.depend
+ 
diff --git a/net-proxy/squid/files/squid-3.0.15-gcc43.patch b/net-proxy/squid/files/squid-3.0.15-gcc43.patch
new file mode 100644
index 000000000000..a9d3f1b594f8
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.15-gcc43.patch
@@ -0,0 +1,13 @@
+diff -Nru squid-3.0.STABLE15.orig/lib/util.c squid-3.0.STABLE15/lib/util.c
+--- squid-3.0.STABLE15.orig/lib/util.c	2009-05-06 11:11:38.000000000 +0000
++++ squid-3.0.STABLE15/lib/util.c	2009-05-09 10:31:41.000000000 +0000
+@@ -751,7 +751,8 @@
+     /* copy string, including terminating character */
+     sz = strlen(s) + 1;
+ 
+-    p = memcpy((char *)xmalloc(sz), s, sz);
++    p = (char *)xmalloc(sz);
++    memcpy(p, s, sz);
+ 
+     PROF_stop(xstrdup);
+ 
diff --git a/net-proxy/squid/files/squid-3.0.15-gentoo.patch b/net-proxy/squid/files/squid-3.0.15-gentoo.patch
new file mode 100644
index 000000000000..2def7187d6cc
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.15-gentoo.patch
@@ -0,0 +1,293 @@
+diff -Nru squid-3.0.STABLE15.orig/acinclude.m4 squid-3.0.STABLE15/acinclude.m4
+--- squid-3.0.STABLE15.orig/acinclude.m4	2009-05-06 11:11:25.000000000 +0000
++++ squid-3.0.STABLE15/acinclude.m4	2009-05-09 09:54:49.000000000 +0000
+@@ -73,7 +73,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
+-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.0.STABLE15.orig/configure.in squid-3.0.STABLE15/configure.in
+--- squid-3.0.STABLE15.orig/configure.in	2009-05-06 11:11:43.000000000 +0000
++++ squid-3.0.STABLE15/configure.in	2009-05-09 09:54:49.000000000 +0000
+@@ -15,9 +15,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
+@@ -177,13 +177,13 @@
+ dnl TODO: check if the problem will be present in any other newer MinGW release.
+     case "$host_os" in
+     mingw|mingw32)
+-        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ 	;;
+     *)
+-        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
++        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
+ 	;;
+     esac
+-    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ else
+     SQUID_CFLAGS=
+     SQUID_CXXFLAGS=
+diff -Nru squid-3.0.STABLE15.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE15/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE15.orig/helpers/basic_auth/MSNT/confload.c	2009-05-06 11:11:32.000000000 +0000
++++ squid-3.0.STABLE15/helpers/basic_auth/MSNT/confload.c	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE15/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE15.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-05-06 11:11:32.000000000 +0000
++++ squid-3.0.STABLE15/helpers/basic_auth/MSNT/msntauth.conf.default	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE15.orig/helpers/basic_auth/SMB/Makefile.am	2009-05-06 11:11:32.000000000 +0000
++++ squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE15/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE15.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-05-06 11:11:32.000000000 +0000
++++ squid-3.0.STABLE15/helpers/basic_auth/SMB/smb_auth.sh	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE15/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE15.orig/helpers/external_acl/session/squid_session.8	2009-05-06 11:11:33.000000000 +0000
++++ squid-3.0.STABLE15/helpers/external_acl/session/squid_session.8	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE15/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE15.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-05-06 11:11:33.000000000 +0000
++++ squid-3.0.STABLE15/helpers/external_acl/unix_group/squid_unix_group.8	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE15/helpers/negotiate_auth/squid_kerb_auth/do.sh
+--- squid-3.0.STABLE15.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-05-06 11:11:33.000000000 +0000
++++ squid-3.0.STABLE15/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-05-09 09:54:49.000000000 +0000
+@@ -7,7 +7,7 @@
+ #
+ CC=gcc
+ #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
+-CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
++CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
+ if [ "$1" = "HEIMDAL" ]; then
+   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
+   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
+diff -Nru squid-3.0.STABLE15.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE15/lib/libTrie/acinclude.m4
+--- squid-3.0.STABLE15.orig/lib/libTrie/acinclude.m4	2009-05-06 11:11:37.000000000 +0000
++++ squid-3.0.STABLE15/lib/libTrie/acinclude.m4	2009-05-09 09:54:49.000000000 +0000
+@@ -9,7 +9,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
+-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.0.STABLE15.orig/lib/libTrie/configure.in squid-3.0.STABLE15/lib/libTrie/configure.in
+--- squid-3.0.STABLE15.orig/lib/libTrie/configure.in	2009-05-06 11:11:37.000000000 +0000
++++ squid-3.0.STABLE15/lib/libTrie/configure.in	2009-05-09 09:54:49.000000000 +0000
+@@ -58,8 +58,8 @@
+ 
+ dnl set useful flags
+ if test "$GCC" = "yes"; then
+-   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+-   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
++   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ else
+    TRIE_CFLAGS=
+    TRIE_CXXFLAGS=
+diff -Nru squid-3.0.STABLE15.orig/src/cf.data.pre squid-3.0.STABLE15/src/cf.data.pre
+--- squid-3.0.STABLE15.orig/src/cf.data.pre	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/cf.data.pre	2009-05-09 09:54:49.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
+@@ -3264,11 +3272,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
+@@ -5218,6 +5226,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-3.0.STABLE15.orig/src/debug.cc squid-3.0.STABLE15/src/debug.cc
+--- squid-3.0.STABLE15.orig/src/debug.cc	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/debug.cc	2009-05-09 09:54:49.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 -Nru squid-3.0.STABLE15.orig/src/defines.h squid-3.0.STABLE15/src/defines.h
+--- squid-3.0.STABLE15.orig/src/defines.h	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/defines.h	2009-05-09 09:54:49.000000000 +0000
+@@ -218,7 +218,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 -Nru squid-3.0.STABLE15.orig/src/main.cc squid-3.0.STABLE15/src/main.cc
+--- squid-3.0.STABLE15.orig/src/main.cc	2009-05-06 11:11:41.000000000 +0000
++++ squid-3.0.STABLE15/src/main.cc	2009-05-09 09:54:49.000000000 +0000
+@@ -1490,7 +1490,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());
+@@ -1534,7 +1534,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);
+@@ -1542,7 +1542,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 -Nru squid-3.0.STABLE15.orig/src/Makefile.am squid-3.0.STABLE15/src/Makefile.am
+--- squid-3.0.STABLE15.orig/src/Makefile.am	2009-05-06 11:11:40.000000000 +0000
++++ squid-3.0.STABLE15/src/Makefile.am	2009-05-09 09:54:49.000000000 +0000
+@@ -991,12 +991,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.15-heimdal.patch b/net-proxy/squid/files/squid-3.0.15-heimdal.patch
new file mode 100644
index 000000000000..56a306e06942
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.15-heimdal.patch
@@ -0,0 +1,18 @@
+diff -Nru squid-3.0.STABLE15.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE15/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-3.0.STABLE15.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-05-06 11:11:33.000000000 +0000
++++ squid-3.0.STABLE15/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-05-09 10:14:42.000000000 +0000
+@@ -18,10 +18,10 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+ 
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include/heimdal
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+ 
+ # MIT
+-KERBINC = 
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC = 
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+ 
diff --git a/net-proxy/squid/squid-3.0.14.ebuild b/net-proxy/squid/squid-3.0.14.ebuild
deleted file mode 100644
index cb29cddd490c..000000000000
--- a/net-proxy/squid/squid-3.0.14.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.14.ebuild,v 1.1 2009/04/15 21:33:00 mrness Exp $
-
-EAPI="2"
-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 \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux epoll"
-
-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
-
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
-	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	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
-			$(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 \
-		--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"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	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
-}
diff --git a/net-proxy/squid/squid-3.0.14-r1.ebuild b/net-proxy/squid/squid-3.0.15.ebuild
index bf7370afd111..c2091f0d0d5f 100644
--- a/net-proxy/squid/squid-3.0.14-r1.ebuild
+++ b/net-proxy/squid/squid-3.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.14-r1.ebuild,v 1.1 2009/04/25 11:42:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.15.ebuild,v 1.1 2009/05/09 08:49:09 mrness Exp $
 
 EAPI="2"
 WANT_AUTOCONF="latest"
@@ -18,7 +18,8 @@ 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"
+SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz
+	mirror://gentoo/${PN}-3.0.14-chunk-encoding.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -61,9 +62,9 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-max-forwards.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	epatch "${WORKDIR}"/${PN}-3.0.14-chunk-encoding.patch
 	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
 	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch