Remove linux-info inheritance (#278272).

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

12 files changed, 29 insertions, 818 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index f5f22e4cb57a..aad345781488 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,14 @@
 # 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.265 2009/07/22 23:24:36 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.266 2009/07/23 06:57:45 mrness Exp $
+
+  23 Jul 2009; Alin Năstac <mrness@gentoo.org>
+  -files/squid-3.0.14-adapted-zph.patch,
+  -files/squid-3.0.14-cross-compile.patch, -files/squid-3.0.14-gcc43.patch,
+  -files/squid-3.0.14-gentoo.patch, -files/squid-3.0.14-heimdal.patch,
+  -files/squid-3.0.14-max-forwards.patch, squid-2.7.6-r1.ebuild,
+  -squid-3.0.14-r2.ebuild, squid-3.0.16.ebuild, squid-3.1.0.9_beta.ebuild:
+  Remove linux-info inheritance (#278272).
 
   22 Jul 2009; Dawid Węgliński <cla@gentoo.org> squid-3.0.16.ebuild:
   Stable on amd64 (bug #277749)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index ea84fd2809c6..6743f7cc2bf0 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,13 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2-capability.patch 970 RMD160 01edc052d32b6531e6db93ff1addef91e193c6df SHA1 533bff849dbcbfb2d85c4a995eaea6585a593fd7 SHA256 4e0cef8fc9643e7b4922c510bf25fbd902eaeaec0846eb49a809229ab75b21c6
 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 902 RMD160 40ccc1c7b39f2f877ebec5cd5e9556e0b5499af0 SHA1 436104235c71c8c9a81431fd8bbbf4da0f280ff3 SHA256 ff6fa8ee56aedc461b840295f072f7568258edc0ac48ffbeadd15ebab030e846
-AUX squid-3.0.14-adapted-zph.patch 6838 RMD160 ec057b12e243301e734dc4296690919e08a33731 SHA1 d8d4c604ea5b0adba50f83f43ec17fff58ca7fdd SHA256 5bace554b163c67c4084fcfb4e3f5ecca8cf447f6f5a5992c790ccb191b35369
-AUX squid-3.0.14-cross-compile.patch 1234 RMD160 24c77750020a9ae61bb64f7e92215c183f28f156 SHA1 6dd2a77f9c2d1f17cc0420200a5b18485d105638 SHA256 32108a3856c219b0ce2af066333bd58b7a2932748474ec48d25cf4bc72f629f8
-AUX squid-3.0.14-gcc43.patch 901 RMD160 6ac1b123a79a205f5b2834c472ae02a8db325eb4 SHA1 d3f8b99b0db48a9411c001296dc9c7e3401fb32b SHA256 47caa6fb8d93353fcb63d0ec970dad46cf4863230b8afdb0992ca6d34fe051d2
-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
@@ -26,14 +23,19 @@ AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
 DIST squid-2.7.STABLE6.tar.gz 1786189 RMD160 ca59583e9d938c3184a306984f034553f768e942 SHA1 0f66afca85444f7d4f49a527470ef14741904db0 SHA256 0aeb0dd601822711cf8e131d82de8bc64e918adbcfea7e834c4529895759331a
 DIST squid-3.0.14-chunk-encoding.patch.gz 7342 RMD160 c4943c2223858b209a294903917e720a4f328ab5 SHA1 ae2e280e66f44bedce1a3b4e45a62615e8b64eae SHA256 a254c0a9d802daacd159512baab98a6f6c5a3b1d6876141f23b6395e79b5f3ac
-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.9.tar.gz 3205401 RMD160 d1f10d0e1b308c1a930442cc8ab6dcd4c78d2066 SHA1 13e5b096a075c23fff0a56d27023116716c47a71 SHA256 99084bdf18a32fbd9b3095cdbdbd1de78e3e1113ad36c6838b49acf3c799d0aa
-EBUILD squid-2.7.6-r1.ebuild 6002 RMD160 28f2996fd27d161cb6f165e242492824255edb41 SHA1 32bce5d5cb492600ecf6c9006447e2c901864ae0 SHA256 58ba369d323c21e481df76306b17b9de607507a4cc3c53e493282d48375dfba5
-EBUILD squid-3.0.14-r2.ebuild 6592 RMD160 e8a8059445b73f15c22892446a8e3438ca6832b0 SHA1 a3be279eb3ee1bfd47cfb21d2a666530abd2b250 SHA256 812d4957678d17512fe418a9c16e2f7a84356e736ade7ba33871e793569b6c80
+EBUILD squid-2.7.6-r1.ebuild 5991 RMD160 00a4a9e9da294b7d79f05c06435c3e7195bb2727 SHA1 7034986b98fc008191a4698ef81e10f1ef2923d3 SHA256 1b73928f0940d8e99c4701563847ae03c6ad819d379e598acd2d22d13644363d
 EBUILD squid-3.0.15.ebuild 6622 RMD160 422f8679e5012cc83c5b2ffbc94f2ee4de29eaa9 SHA1 93a19944a05a9afe44472fb1e1d63261b131f2eb SHA256 0e6e8ce7461c9f95d5c9467290101770c8b2f803bbba706c3ded54aac57af51a
-EBUILD squid-3.0.16.ebuild 6396 RMD160 f0b80d8c028d3ec5269f49e7d9b44a5b6afd71e0 SHA1 209a8e4810ea626397d1ef09333ab73e9cf2930e SHA256 c796872b9843eab0e1e9654f3f74930875766639975221d4b1e5fabea2f74844
-EBUILD squid-3.1.0.9_beta.ebuild 6616 RMD160 2b7c572e50e8496cdf96f1a4015533393fc6fa31 SHA1 e4c4f492572449d00887cc552f7d8b9edd55c269 SHA256 c6866b492d61f77598682fdc40661fcf8d2b64a37118cc470727423845e48380
-MISC ChangeLog 57005 RMD160 2924d74808a9e57cd539bb6b3b6a8e0e46af40a9 SHA1 0cb89e765b845ab24bd918a606bbe8bed6ea02dc SHA256 d5e046a4d947dc2d184895f368d169cbc9a1033c6291836a759c43a600660b08
+EBUILD squid-3.0.16.ebuild 6388 RMD160 5b86c3b092be1d2c562fe80a0a1a7523ed4d0127 SHA1 0ba223321aa91b229f2bc0ecd72612193517bb98 SHA256 d7ed3f17996b1cf3aac97709301d8bc14d07075318893500d497797313fd5f5c
+EBUILD squid-3.1.0.9_beta.ebuild 6605 RMD160 8e14eee3bda2029772024adf0674e2de354f9688 SHA1 e00fd1f1e0eb7ac27d284f64cfb3f11aef1963f3 SHA256 2828e348750027703c42e4127f7940daf12865c658b0550af1362fdfd9f14d88
+MISC ChangeLog 57428 RMD160 18baa5d728339b3ffafd6e58f352e9862346f032 SHA1 f117e6f6fb9a0f10881225cb7bbd174298686a11 SHA256 14de72e7cde5ba3e39cd7f33b409559290aebb6dbe9c07368258a677ee769434
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpoCfgACgkQ9A5kJBGSrsuW1QCfSRby9EnGyyWcQ0FH+Fl/+wuS
+8DwAn03vibkiLTSg8Pw3LDHpK+ywXb/J
+=+4aA
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.0.14-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.14-adapted-zph.patch
deleted file mode 100644
index 97b1b08c04f2..000000000000
--- a/net-proxy/squid/files/squid-3.0.14-adapted-zph.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Nru squid-3.0.STABLE14.orig/src/cf.data.pre squid-3.0.STABLE14/src/cf.data.pre
---- squid-3.0.STABLE14.orig/src/cf.data.pre	2009-04-15 21:15:34.000000000 +0000
-+++ squid-3.0.STABLE14/src/cf.data.pre	2009-04-15 21:15:56.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.STABLE14.orig/src/client_side_reply.cc squid-3.0.STABLE14/src/client_side_reply.cc
---- squid-3.0.STABLE14.orig/src/client_side_reply.cc	2009-04-11 08:35:41.000000000 +0000
-+++ squid-3.0.STABLE14/src/client_side_reply.cc	2009-04-15 21:15:56.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.STABLE14.orig/src/fde.h squid-3.0.STABLE14/src/fde.h
---- squid-3.0.STABLE14.orig/src/fde.h	2009-04-11 08:35:41.000000000 +0000
-+++ squid-3.0.STABLE14/src/fde.h	2009-04-15 21:15:56.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.STABLE14.orig/src/forward.cc squid-3.0.STABLE14/src/forward.cc
---- squid-3.0.STABLE14.orig/src/forward.cc	2009-04-11 08:35:41.000000000 +0000
-+++ squid-3.0.STABLE14/src/forward.cc	2009-04-15 21:15:56.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.STABLE14.orig/src/structs.h squid-3.0.STABLE14/src/structs.h
---- squid-3.0.STABLE14.orig/src/structs.h	2009-04-11 08:35:42.000000000 +0000
-+++ squid-3.0.STABLE14/src/structs.h	2009-04-15 21:15:56.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.14-cross-compile.patch b/net-proxy/squid/files/squid-3.0.14-cross-compile.patch
deleted file mode 100644
index 77d96c7d23ee..000000000000
--- a/net-proxy/squid/files/squid-3.0.14-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Nru squid-3.0.STABLE14.orig/configure.in squid-3.0.STABLE14/configure.in
---- squid-3.0.STABLE14.orig/configure.in	2009-04-25 11:24:10.000000000 +0000
-+++ squid-3.0.STABLE14/configure.in	2009-04-25 11:31:02.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.STABLE14.orig/src/Makefile.am squid-3.0.STABLE14/src/Makefile.am
---- squid-3.0.STABLE14.orig/src/Makefile.am	2009-04-25 11:24:10.000000000 +0000
-+++ squid-3.0.STABLE14/src/Makefile.am	2009-04-25 11:31:02.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.14-gcc43.patch b/net-proxy/squid/files/squid-3.0.14-gcc43.patch
deleted file mode 100644
index cc2a843201c5..000000000000
--- a/net-proxy/squid/files/squid-3.0.14-gcc43.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nru squid-3.0.STABLE14.orig/lib/util.c squid-3.0.STABLE14/lib/util.c
---- squid-3.0.STABLE14.orig/lib/util.c	2009-04-11 08:35:38.000000000 +0000
-+++ squid-3.0.STABLE14/lib/util.c	2009-04-25 11:28:40.000000000 +0000
-@@ -755,7 +755,7 @@
- 
-     PROF_stop(xstrdup);
- 
--    return p;
-+    return (char *)p;
- }
- 
- /*
-@@ -765,7 +765,7 @@
- xstrndup(const char *s, size_t n)
- {
-     size_t sz;
--    void *p;
-+    char *p;
-     PROF_start(xstrndup);
-     assert(s != NULL);
-     assert(n);
-@@ -774,7 +774,7 @@
-     if (sz > n)
-         sz = n;
- 
--    p = xstrncpy(xmalloc(sz), s, sz);
-+    p = xstrncpy((char *)xmalloc(sz), s, sz);
- 
-     PROF_stop(xstrndup);
- 
-@@ -923,7 +923,7 @@
- xint64toa(int64_t num)
- {
-     static char buf[24];	/* 2^64 = 18446744073709551616 */
--    snprintf(buf, sizeof(buf), "%" PRId64, num);
-+    snprintf(buf, sizeof(buf), "%" PRId64, (long long int)num);
-     return buf;
- }
- 
diff --git a/net-proxy/squid/files/squid-3.0.14-gentoo.patch b/net-proxy/squid/files/squid-3.0.14-gentoo.patch
deleted file mode 100644
index 1e25ec9838a0..000000000000
--- a/net-proxy/squid/files/squid-3.0.14-gentoo.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -Nru squid-3.0.STABLE14.orig/acinclude.m4 squid-3.0.STABLE14/acinclude.m4
---- squid-3.0.STABLE14.orig/acinclude.m4	2009-04-11 08:35:27.000000000 +0000
-+++ squid-3.0.STABLE14/acinclude.m4	2009-04-15 21:14:50.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.STABLE14.orig/configure.in squid-3.0.STABLE14/configure.in
---- squid-3.0.STABLE14.orig/configure.in	2009-04-11 08:35:42.000000000 +0000
-+++ squid-3.0.STABLE14/configure.in	2009-04-15 21:14:50.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.STABLE14.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE14/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE14.orig/helpers/basic_auth/MSNT/confload.c	2009-04-11 08:35:32.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/basic_auth/MSNT/confload.c	2009-04-15 21:14:50.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.STABLE14.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE14/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE14.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-04-11 08:35:33.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/basic_auth/MSNT/msntauth.conf.default	2009-04-15 21:14:50.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.STABLE14.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE14/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE14.orig/helpers/basic_auth/SMB/Makefile.am	2009-04-11 08:35:33.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/basic_auth/SMB/Makefile.am	2009-04-15 21:14:50.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.STABLE14.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE14/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE14.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-04-11 08:35:33.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/basic_auth/SMB/smb_auth.sh	2009-04-15 21:14:50.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.STABLE14.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE14/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE14.orig/helpers/external_acl/session/squid_session.8	2009-04-11 08:35:34.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/external_acl/session/squid_session.8	2009-04-15 21:14:50.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.STABLE14.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE14/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE14.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-04-11 08:35:34.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/external_acl/unix_group/squid_unix_group.8	2009-04-15 21:14:50.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.STABLE14.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE14/helpers/negotiate_auth/squid_kerb_auth/do.sh
---- squid-3.0.STABLE14.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-04-11 08:35:34.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-04-15 21:14:50.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.STABLE14.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE14/lib/libTrie/acinclude.m4
---- squid-3.0.STABLE14.orig/lib/libTrie/acinclude.m4	2009-04-11 08:35:38.000000000 +0000
-+++ squid-3.0.STABLE14/lib/libTrie/acinclude.m4	2009-04-15 21:14:50.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.STABLE14.orig/lib/libTrie/configure.in squid-3.0.STABLE14/lib/libTrie/configure.in
---- squid-3.0.STABLE14.orig/lib/libTrie/configure.in	2009-04-11 08:35:38.000000000 +0000
-+++ squid-3.0.STABLE14/lib/libTrie/configure.in	2009-04-15 21:14:50.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.STABLE14.orig/src/cf.data.pre squid-3.0.STABLE14/src/cf.data.pre
---- squid-3.0.STABLE14.orig/src/cf.data.pre	2009-04-11 08:35:40.000000000 +0000
-+++ squid-3.0.STABLE14/src/cf.data.pre	2009-04-15 21:14:50.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.STABLE14.orig/src/debug.cc squid-3.0.STABLE14/src/debug.cc
---- squid-3.0.STABLE14.orig/src/debug.cc	2009-04-11 08:35:41.000000000 +0000
-+++ squid-3.0.STABLE14/src/debug.cc	2009-04-15 21:14:50.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.STABLE14.orig/src/defines.h squid-3.0.STABLE14/src/defines.h
---- squid-3.0.STABLE14.orig/src/defines.h	2009-04-11 08:35:41.000000000 +0000
-+++ squid-3.0.STABLE14/src/defines.h	2009-04-15 21:14:50.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.STABLE14.orig/src/main.cc squid-3.0.STABLE14/src/main.cc
---- squid-3.0.STABLE14.orig/src/main.cc	2009-04-11 08:35:41.000000000 +0000
-+++ squid-3.0.STABLE14/src/main.cc	2009-04-15 21:14:50.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.STABLE14.orig/src/Makefile.am squid-3.0.STABLE14/src/Makefile.am
---- squid-3.0.STABLE14.orig/src/Makefile.am	2009-04-11 08:35:40.000000000 +0000
-+++ squid-3.0.STABLE14/src/Makefile.am	2009-04-15 21:14:50.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.14-heimdal.patch b/net-proxy/squid/files/squid-3.0.14-heimdal.patch
deleted file mode 100644
index ec1e37bf7acc..000000000000
--- a/net-proxy/squid/files/squid-3.0.14-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nru squid-3.0.STABLE14.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE14/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-3.0.STABLE14.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-04-11 08:35:34.000000000 +0000
-+++ squid-3.0.STABLE14/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-04-15 21:17:01.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/files/squid-3.0.14-max-forwards.patch b/net-proxy/squid/files/squid-3.0.14-max-forwards.patch
deleted file mode 100644
index 52b274f81b29..000000000000
--- a/net-proxy/squid/files/squid-3.0.14-max-forwards.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru squid-3.0.STABLE14.orig/src/HttpHeader.cc squid-3.0.STABLE14/src/HttpHeader.cc
---- squid-3.0.STABLE14.orig/src/HttpHeader.cc	2009-04-11 08:35:40.000000000 +0000
-+++ squid-3.0.STABLE14/src/HttpHeader.cc	2009-04-25 11:34:00.000000000 +0000
-@@ -106,7 +106,7 @@
-         {"Last-Modified", HDR_LAST_MODIFIED, ftDate_1123},
-         {"Link", HDR_LINK, ftStr},
-         {"Location", HDR_LOCATION, ftStr},
--        {"Max-Forwards", HDR_MAX_FORWARDS, ftInt},
-+        {"Max-Forwards", HDR_MAX_FORWARDS, ftInt64},
-         {"Mime-Version", HDR_MIME_VERSION, ftStr},	/* for now */
-         {"Pragma", HDR_PRAGMA, ftStr},
-         {"Proxy-Authenticate", HDR_PROXY_AUTHENTICATE, ftStr},
diff --git a/net-proxy/squid/squid-2.7.6-r1.ebuild b/net-proxy/squid/squid-2.7.6-r1.ebuild
index 6af1067b75a1..f5852b009c36 100644
--- a/net-proxy/squid/squid-2.7.6-r1.ebuild
+++ b/net-proxy/squid/squid-2.7.6-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.8 2009/06/23 19:45:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.9 2009/07/23 06:57:45 mrness Exp $
 
 EAPI="2"
 
-inherit eutils pam toolchain-funcs autotools linux-info
+inherit eutils pam toolchain-funcs autotools
 
 #lame archive versioning scheme..
 S_PMV="${PV%%.*}"
diff --git a/net-proxy/squid/squid-3.0.14-r2.ebuild b/net-proxy/squid/squid-3.0.14-r2.ebuild
deleted file mode 100644
index 31e92051d8bf..000000000000
--- a/net-proxy/squid/squid-3.0.14-r2.ebuild
+++ /dev/null
@@ -1,197 +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-r2.ebuild,v 1.6 2009/05/20 17:06:55 nixnut 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
-	mirror://gentoo/${P}-chunk-encoding.patch.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
-	epatch "${FILESDIR}"/${P}-max-forwards.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	epatch "${WORKDIR}"/${P}-chunk-encoding.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.16.ebuild b/net-proxy/squid/squid-3.0.16.ebuild
index 52783e2736c4..0f224fab6da7 100644
--- a/net-proxy/squid/squid-3.0.16.ebuild
+++ b/net-proxy/squid/squid-3.0.16.ebuild
@@ -1,10 +1,10 @@
 # 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.7 2009/07/22 23:24:36 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.16.ebuild,v 1.8 2009/07/23 06:57:45 mrness Exp $
 
 EAPI="2"
 
-inherit eutils pam toolchain-funcs autotools linux-info
+inherit eutils pam toolchain-funcs autotools
 
 # lame archive versioning scheme..
 S_PMV="${PV%%.*}"
diff --git a/net-proxy/squid/squid-3.1.0.9_beta.ebuild b/net-proxy/squid/squid-3.1.0.9_beta.ebuild
index af351b18b8c3..0752e4b30fb1 100644
--- a/net-proxy/squid/squid-3.1.0.9_beta.ebuild
+++ b/net-proxy/squid/squid-3.1.0.9_beta.ebuild
@@ -1,10 +1,10 @@
 # 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.9_beta.ebuild,v 1.1 2009/07/14 06:35:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.9_beta.ebuild,v 1.2 2009/07/23 06:57:45 mrness Exp $
 
 EAPI="2"
 
-inherit eutils pam toolchain-funcs linux-info
+inherit eutils pam toolchain-funcs
 
 RESTRICT="test" # check if test works in next bump