Remove ugly libcap hack (#270450). Version bump.

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

11 files changed, 793 insertions, 19 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index f76513163bbd..8af94f150753 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.251 2009/05/20 17:06:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.252 2009/06/15 23:42:37 mrness Exp $
+
+*squid-3.0.16 (15 Jun 2009)
+
+  15 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  +files/squid-2-capability.patch, +files/squid-3.0.16-adapted-zph.patch,
+  +files/squid-3.0.16-cross-compile.patch, +files/squid-3.0.16-gentoo.patch,
+  +files/squid-3-capability.patch, squid-2.7.6-r1.ebuild,
+  squid-3.0.15.ebuild, +squid-3.0.16.ebuild, squid-3.1.0.7_beta.ebuild:
+  Remove ugly libcap hack (#270450). Version bump.
 
   20 May 2009; nixnut <nixnut@gentoo.org> squid-3.0.14-r2.ebuild:
   ppc stable #269096
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index d46d6e502e81..045a4ecbf918 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,5 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX squid-2-capability.patch 500 RMD160 b5b7b84d292f03e639f9026ce403ef1ba4a16bd2 SHA1 a94ac183ada5f4367b5e40e47dc63ca8822c7620 SHA256 63b62b7b2a81a71c15f1112f008e2d986b8c22588d5902da537e6593a7dde0da
 AUX squid-2.7.6-gentoo.patch 13118 RMD160 5d51d90af5b85158507d231ce57aa544cc790c7d SHA1 52a95fc33a5eaecf57f95709747fb0a8b88a8c97 SHA256 5181fa5faccfeb328a0288bd711d31597ba414efcd807ac7a46630414ac0a9eb
 AUX squid-2.7.6-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
+AUX squid-3-capability.patch 386 RMD160 10c1798316240ae568cab863a01d181d36b26b65 SHA1 ef27b2841352dfa0671de907c23ad989809c629a SHA256 8317311aaca4050b75d5e72dcd749493f4dfd09b95205bd21adeec9fc9477ff6
 AUX squid-3.0.13-adapted-zph.patch 6838 RMD160 5a8728e93498ce03fdcbc1926c63271d562b9671 SHA1 1f6453eb8d00e3ac84b4000aeb14cdf3da54f9d4 SHA256 13f4c3cd42ce662cf0e13fb4ca27b0e50562d22af69aabc373a1ff299c694a29
 AUX squid-3.0.13-gentoo.patch 13095 RMD160 5184e54faef48bf5ed8c93d92761e39be8885739 SHA1 f671c6aa4a051b9f454afc08769bafedc3c92f2e SHA256 2209444bdd0149404a77478f8d445cc7a0b4e012a25557dbf8a2e3659b0883d9
 AUX squid-3.0.13-heimdal.patch 780 RMD160 4cf5b9494a0537bdd0f886b46e7f0685d0e428be SHA1 71b99ceed606c3e41db9f0f78a8d993d8e35a407 SHA256 a51da87baf57bf251c0c401a29b296a89ffa391f5da6e821bbe15a309dd76537
@@ -14,6 +19,9 @@ AUX squid-3.0.15-cross-compile.patch 1234 RMD160 7e85617679c73cbe70c0992f5321304
 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.0.16-adapted-zph.patch 6838 RMD160 8a3aeddf48efccae072c6a4515cb188562a5bb91 SHA1 cfc842049aa81adb388e78a3aa5b9efbf6d92642 SHA256 b85e78df0e5f8e51f7da6386e502cc82965e4375d4f1f4e04504d04ad488964a
+AUX squid-3.0.16-cross-compile.patch 1234 RMD160 d4420fe001d2aa42b321f1c6d52bec542a23b29f SHA1 fd1a82814c09f77ff1cba4b0abb87be07281c325 SHA256 3ce33f078f120ee30b66f957dcb1ba427360b974f3458db2fc4261458f1f1d15
+AUX squid-3.0.16-gentoo.patch 13095 RMD160 b0ca0fad05db493358f426eb014a13c46806af63 SHA1 392cb4aa66ab3bda1f564da5945322a9dfe78e48 SHA256 3d357bfe5b8ab8ac214fed250f669f5fa1c55e091300d98dc5dcec25e328049d
 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
@@ -26,11 +34,20 @@ DIST squid-3.0.14-chunk-encoding.patch.gz 7342 RMD160 c4943c2223858b209a29490391
 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.0.STABLE16.tar.gz 2449986 RMD160 d9e019ef5c2fb26f0a16a9bfbce5fe0269360ab1 SHA1 3d0ba0e509b7939b9023f1b25cc956e4ac3c0ba1 SHA256 a50c9d1d276f59a2754f13c27468445290930c000cb1457160bfe8898620b615
 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-2.7.6-r1.ebuild 5940 RMD160 5b91d674be3300c7bfed7d1b30df48a2f038396d SHA1 164412cead1a39412d488cce3736b8908d315e04 SHA256 5981bf0f065742f28bf6a1941779f5df7b8e53a3f2b83352d85c89afe70a61e2
 EBUILD squid-3.0.13.ebuild 6458 RMD160 d3ca104a621de1e4f435bf8ca74c50f130210710 SHA1 f2ee7dcd7269d5024b1e1c82ea4341336a7e9766 SHA256 0606094713ec67bbbdbd37592f28d5babde42a93c8be76e1d20487afe296bbc2
 EBUILD squid-3.0.14-r2.ebuild 6592 RMD160 e8a8059445b73f15c22892446a8e3438ca6832b0 SHA1 a3be279eb3ee1bfd47cfb21d2a666530abd2b250 SHA256 812d4957678d17512fe418a9c16e2f7a84356e736ade7ba33871e793569b6c80
-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 54666 RMD160 d192c0638528110c038131eaaac3ec4e687ff469 SHA1 7e53e22186121473dff35e10d259de64f43a2a3d SHA256 c6927ac927863c24a57ce324ba6fdd27123936b3d2fae71b7956c1b9277790aa
+EBUILD squid-3.0.15.ebuild 6568 RMD160 7e36952c8e7703cfc8056d7490c86337837aabce SHA1 7cea4ab2d3dad722a22a00780d29345df3a538ed SHA256 13ed8568101167f832d249a4c71c14f9f4ba94b1f56fc6252a0d17a6cf97081b
+EBUILD squid-3.0.16.ebuild 6345 RMD160 60d081b113dbbbeac167e902fab620d67b2701d4 SHA1 c65477023921acb8f242a6b2711f31a383162f2f SHA256 da0694055e70cf47fa21375eefbc3c16765cec1e6cb9ee9976c86e93e41e4134
+EBUILD squid-3.1.0.7_beta.ebuild 6717 RMD160 7113becd62ce2c77b79120cd3f69422adc690dd4 SHA1 d2fa3e4525d4a8617a16f3db76d47802edbbca2c SHA256 0199755988a9da9485c3ba464e85524b8d81c275aefba60906baad5c16aa435d
+MISC ChangeLog 55076 RMD160 630fda8b9e9f0bcbee97288c39ecbb2b4b71aefb SHA1 c25a59939d0584b764d1a3d7c0c85e053875d238 SHA256 ffae2708faf60ba100e7694141442f8e6d2f491ed77b8074a0cf59488388a183
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko23HoACgkQts85UDFmaOVttACcCD4zkQydSuXE3BtdG9CIVBnJ
+JbUAnAuQbndQejuKbs2+Z3b1R2Lmj5te
+=oXsa
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2-capability.patch b/net-proxy/squid/files/squid-2-capability.patch
new file mode 100644
index 000000000000..da55945d52ca
--- /dev/null
+++ b/net-proxy/squid/files/squid-2-capability.patch
@@ -0,0 +1,15 @@
+diff -Nru squid-2.7.STABLE6.orig/src/tools.c squid-2.7.STABLE6/src/tools.c
+--- squid-2.7.STABLE6.orig/src/tools.c	2008-10-06 23:27:17.000000000 +0200
++++ squid-2.7.STABLE6/src/tools.c	2009-06-15 23:40:53.000000000 +0200
+@@ -42,11 +42,6 @@
+ 
+ #ifdef _SQUID_LINUX_
+ #if HAVE_SYS_CAPABILITY_H
+-#undef _POSIX_SOURCE
+-/* Ugly glue to get around linux header madness colliding with glibc */
+-#define _LINUX_TYPES_H
+-#define _LINUX_FS_H
+-typedef uint32_t __u32;
+ #include <sys/capability.h>
+ #endif
+ #endif
diff --git a/net-proxy/squid/files/squid-3-capability.patch b/net-proxy/squid/files/squid-3-capability.patch
new file mode 100644
index 000000000000..b251ad745267
--- /dev/null
+++ b/net-proxy/squid/files/squid-3-capability.patch
@@ -0,0 +1,14 @@
+--- src/tools.cc	2009-05-06 13:11:42.000000000 +0200
++++ src/tools.cc	2009-06-15 23:33:00.000000000 +0200
+@@ -42,11 +42,6 @@
+ 
+ #ifdef _SQUID_LINUX_
+ #if HAVE_SYS_CAPABILITY_H
+-#undef _POSIX_SOURCE
+-/* Ugly glue to get around linux header madness colliding with glibc */
+-#define _LINUX_TYPES_H
+-#define _LINUX_FS_H
+-typedef uint32_t __u32;
+ #include <sys/capability.h>
+ #endif
+ #endif
diff --git a/net-proxy/squid/files/squid-3.0.16-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.16-adapted-zph.patch
new file mode 100644
index 000000000000..c06c3d8447d4
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.16-adapted-zph.patch
@@ -0,0 +1,202 @@
+diff -Nru squid-3.0.STABLE16.orig/src/cf.data.pre squid-3.0.STABLE16/src/cf.data.pre
+--- squid-3.0.STABLE16.orig/src/cf.data.pre	2009-06-16 01:05:01.000000000 +0200
++++ squid-3.0.STABLE16/src/cf.data.pre	2009-06-16 01:05:34.000000000 +0200
+@@ -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.STABLE16.orig/src/client_side_reply.cc squid-3.0.STABLE16/src/client_side_reply.cc
+--- squid-3.0.STABLE16.orig/src/client_side_reply.cc	2009-06-15 09:31:30.000000000 +0200
++++ squid-3.0.STABLE16/src/client_side_reply.cc	2009-06-16 01:05:34.000000000 +0200
+@@ -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.STABLE16.orig/src/fde.h squid-3.0.STABLE16/src/fde.h
+--- squid-3.0.STABLE16.orig/src/fde.h	2009-06-15 09:31:31.000000000 +0200
++++ squid-3.0.STABLE16/src/fde.h	2009-06-16 01:05:34.000000000 +0200
+@@ -106,7 +106,7 @@
+         long handle;
+     } win32;
+ #endif
+-
++    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
+ };
+ 
+ #endif /* SQUID_FDE_H */
+diff -Nru squid-3.0.STABLE16.orig/src/forward.cc squid-3.0.STABLE16/src/forward.cc
+--- squid-3.0.STABLE16.orig/src/forward.cc	2009-06-15 09:31:31.000000000 +0200
++++ squid-3.0.STABLE16/src/forward.cc	2009-06-16 01:05:34.000000000 +0200
+@@ -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.STABLE16.orig/src/structs.h squid-3.0.STABLE16/src/structs.h
+--- squid-3.0.STABLE16.orig/src/structs.h	2009-06-15 09:31:32.000000000 +0200
++++ squid-3.0.STABLE16/src/structs.h	2009-06-16 01:05:34.000000000 +0200
+@@ -554,6 +554,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;
+     }
+@@ -722,6 +724,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.16-cross-compile.patch b/net-proxy/squid/files/squid-3.0.16-cross-compile.patch
new file mode 100644
index 000000000000..d1a43a2396dc
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.16-cross-compile.patch
@@ -0,0 +1,38 @@
+diff -Nru squid-3.0.STABLE16.orig/configure.in squid-3.0.STABLE16/configure.in
+--- squid-3.0.STABLE16.orig/configure.in	2009-06-16 00:56:47.000000000 +0200
++++ squid-3.0.STABLE16/configure.in	2009-06-16 00:57:59.000000000 +0200
+@@ -1895,6 +1895,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.STABLE16.orig/src/Makefile.am squid-3.0.STABLE16/src/Makefile.am
+--- squid-3.0.STABLE16.orig/src/Makefile.am	2009-06-16 00:56:47.000000000 +0200
++++ squid-3.0.STABLE16/src/Makefile.am	2009-06-16 00:57:59.000000000 +0200
+@@ -1011,6 +1011,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
+@@ -1034,6 +1036,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.16-gentoo.patch b/net-proxy/squid/files/squid-3.0.16-gentoo.patch
new file mode 100644
index 000000000000..1a788b519cdf
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.16-gentoo.patch
@@ -0,0 +1,293 @@
+diff -Nru squid-3.0.STABLE16.orig/acinclude.m4 squid-3.0.STABLE16/acinclude.m4
+--- squid-3.0.STABLE16.orig/acinclude.m4	2009-06-15 09:31:05.000000000 +0200
++++ squid-3.0.STABLE16/acinclude.m4	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/configure.in squid-3.0.STABLE16/configure.in
+--- squid-3.0.STABLE16.orig/configure.in	2009-06-15 09:31:33.000000000 +0200
++++ squid-3.0.STABLE16/configure.in	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE16/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE16.orig/helpers/basic_auth/MSNT/confload.c	2009-06-15 09:31:13.000000000 +0200
++++ squid-3.0.STABLE16/helpers/basic_auth/MSNT/confload.c	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE16/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE16.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-06-15 09:31:13.000000000 +0200
++++ squid-3.0.STABLE16/helpers/basic_auth/MSNT/msntauth.conf.default	2009-06-16 00:56:13.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-3.0.STABLE16.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE16/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE16.orig/helpers/basic_auth/SMB/Makefile.am	2009-06-15 09:31:14.000000000 +0200
++++ squid-3.0.STABLE16/helpers/basic_auth/SMB/Makefile.am	2009-06-16 00:56:13.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-3.0.STABLE16.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE16/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE16.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-06-15 09:31:14.000000000 +0200
++++ squid-3.0.STABLE16/helpers/basic_auth/SMB/smb_auth.sh	2009-06-16 00:56:13.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-3.0.STABLE16.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE16/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE16.orig/helpers/external_acl/session/squid_session.8	2009-06-15 09:31:15.000000000 +0200
++++ squid-3.0.STABLE16/helpers/external_acl/session/squid_session.8	2009-06-16 00:56:13.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-3.0.STABLE16.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE16/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE16.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-06-15 09:31:15.000000000 +0200
++++ squid-3.0.STABLE16/helpers/external_acl/unix_group/squid_unix_group.8	2009-06-16 00:56:13.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-3.0.STABLE16.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE16/helpers/negotiate_auth/squid_kerb_auth/do.sh
+--- squid-3.0.STABLE16.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-06-15 09:31:22.000000000 +0200
++++ squid-3.0.STABLE16/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-06-16 00:56:13.000000000 +0200
+@@ -7,7 +7,7 @@
+ #
+ CC=gcc
+ #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
+-CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
++CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
+ if [ "$1" = "HEIMDAL" ]; then
+   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
+   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
+diff -Nru squid-3.0.STABLE16.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE16/lib/libTrie/acinclude.m4
+--- squid-3.0.STABLE16.orig/lib/libTrie/acinclude.m4	2009-06-15 09:31:25.000000000 +0200
++++ squid-3.0.STABLE16/lib/libTrie/acinclude.m4	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/lib/libTrie/configure.in squid-3.0.STABLE16/lib/libTrie/configure.in
+--- squid-3.0.STABLE16.orig/lib/libTrie/configure.in	2009-06-15 09:31:25.000000000 +0200
++++ squid-3.0.STABLE16/lib/libTrie/configure.in	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/src/cf.data.pre squid-3.0.STABLE16/src/cf.data.pre
+--- squid-3.0.STABLE16.orig/src/cf.data.pre	2009-06-15 09:31:30.000000000 +0200
++++ squid-3.0.STABLE16/src/cf.data.pre	2009-06-16 00:56:13.000000000 +0200
+@@ -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
+@@ -3296,11 +3304,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
+@@ -5250,6 +5258,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.STABLE16.orig/src/debug.cc squid-3.0.STABLE16/src/debug.cc
+--- squid-3.0.STABLE16.orig/src/debug.cc	2009-06-15 09:31:30.000000000 +0200
++++ squid-3.0.STABLE16/src/debug.cc	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/src/defines.h squid-3.0.STABLE16/src/defines.h
+--- squid-3.0.STABLE16.orig/src/defines.h	2009-06-15 09:31:30.000000000 +0200
++++ squid-3.0.STABLE16/src/defines.h	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/src/main.cc squid-3.0.STABLE16/src/main.cc
+--- squid-3.0.STABLE16.orig/src/main.cc	2009-06-15 09:31:31.000000000 +0200
++++ squid-3.0.STABLE16/src/main.cc	2009-06-16 00:56:13.000000000 +0200
+@@ -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.STABLE16.orig/src/Makefile.am squid-3.0.STABLE16/src/Makefile.am
+--- squid-3.0.STABLE16.orig/src/Makefile.am	2009-06-15 09:31:28.000000000 +0200
++++ squid-3.0.STABLE16/src/Makefile.am	2009-06-16 00:56:13.000000000 +0200
+@@ -995,12 +995,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/squid-2.7.6-r1.ebuild b/net-proxy/squid/squid-2.7.6-r1.ebuild
index b179838e6bcd..39a7d9e14176 100644
--- a/net-proxy/squid/squid-2.7.6-r1.ebuild
+++ b/net-proxy/squid/squid-2.7.6-r1.ebuild
@@ -1,9 +1,8 @@
 # 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-2.7.6-r1.ebuild,v 1.6 2009/04/22 20:19:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.7 2009/06/15 23:42:37 mrness Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+EAPI="2"
 
 inherit eutils pam toolchain-funcs autotools linux-info
 
@@ -54,16 +53,14 @@ pkg_setup() {
 	enewuser squid 31 -1 /var/cache/squid squid
 }
 
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-
-	cd "${S}" || die "source dir not found"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2-capability.patch
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
 	eautoreconf
 }
 
-src_compile() {
+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}"
@@ -136,8 +133,6 @@ src_compile() {
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/net-proxy/squid/squid-3.0.15.ebuild b/net-proxy/squid/squid-3.0.15.ebuild
index c2091f0d0d5f..7a6611d32e0e 100644
--- a/net-proxy/squid/squid-3.0.15.ebuild
+++ b/net-proxy/squid/squid-3.0.15.ebuild
@@ -1,10 +1,8 @@
 # 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.15.ebuild,v 1.1 2009/05/09 08:49:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.15.ebuild,v 1.2 2009/06/15 23:42:37 mrness Exp $
 
 EAPI="2"
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
 
 inherit eutils pam toolchain-funcs autotools linux-info
 
@@ -61,6 +59,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3-capability.patch
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-cross-compile.patch
diff --git a/net-proxy/squid/squid-3.0.16.ebuild b/net-proxy/squid/squid-3.0.16.ebuild
new file mode 100644
index 000000000000..e7e62baf01c5
--- /dev/null
+++ b/net-proxy/squid/squid-3.0.16.ebuild
@@ -0,0 +1,191 @@
+# 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.16.ebuild,v 1.1 2009/06/15 23:42:37 mrness Exp $
+
+EAPI="2"
+
+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}"/${PN}-3-capability.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.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.1.0.7_beta.ebuild b/net-proxy/squid/squid-3.1.0.7_beta.ebuild
index c437c31469f2..4ba1ddedb470 100644
--- a/net-proxy/squid/squid-3.1.0.7_beta.ebuild
+++ b/net-proxy/squid/squid-3.1.0.7_beta.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.1.0.7_beta.ebuild,v 1.1 2009/04/26 12:03:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.7_beta.ebuild,v 1.2 2009/06/15 23:42:37 mrness Exp $
 
 EAPI="2"
 WANT_AUTOCONF="latest"
@@ -54,6 +54,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3-capability.patch
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 
 	# recursive eautoreconf breaks lib/libLtdl/libtool script and elibtoolize breaks linking