Remove obsolete versions. Version bump (#284211).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 91 insertions, 457 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e75fc7a507fc..4acf7a7c8eec 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,17 @@
 # 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.282 2009/08/31 00:04:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.283 2009/09/12 06:34:47 mrness Exp $
+
+*squid-3.0.19 (12 Sep 2009)
+
+  12 Sep 2009; Alin Năstac <mrness@gentoo.org>
+  -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.0.19-adapted-zph.patch,
+  +files/squid-3.0.19-cross-compile.patch, +files/squid-3.0.19-gentoo.patch,
+  -squid-2.7.6-r1.ebuild, -squid-3.0.16.ebuild, -squid-3.0.18.ebuild,
+  +squid-3.0.19.ebuild:
+  Remove obsolete versions. Version bump (#284211).
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> squid-2.7.6-r2.ebuild,
   squid-3.0.18-r1.ebuild:
diff --git a/net-proxy/squid/files/squid-3.0.16-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.19-adapted-zph.patch
index c06c3d8447d4..0bd256e9f3bc 100644
--- a/net-proxy/squid/files/squid-3.0.16-adapted-zph.patch
+++ b/net-proxy/squid/files/squid-3.0.19-adapted-zph.patch
@@ -1,6 +1,6 @@
-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
+diff -Nru squid-3.0.STABLE19.orig/src/cf.data.pre squid-3.0.STABLE19/src/cf.data.pre
+--- squid-3.0.STABLE19.orig/src/cf.data.pre	2009-09-12 07:25:41.000000000 +0200
++++ squid-3.0.STABLE19/src/cf.data.pre	2009-09-12 07:26:48.000000000 +0200
 @@ -1133,6 +1133,60 @@
  	making the request.
  DOC_END
@@ -62,9 +62,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/cf.data.pre squid-3.0.STABLE16/src/cf.data
  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
+diff -Nru squid-3.0.STABLE19.orig/src/client_side_reply.cc squid-3.0.STABLE19/src/client_side_reply.cc
+--- squid-3.0.STABLE19.orig/src/client_side_reply.cc	2009-09-06 13:29:37.000000000 +0200
++++ squid-3.0.STABLE19/src/client_side_reply.cc	2009-09-12 07:26:48.000000000 +0200
 @@ -48,6 +48,7 @@
  #include "ESI.h"
  #endif
@@ -73,7 +73,7 @@ diff -Nru squid-3.0.STABLE16.orig/src/client_side_reply.cc squid-3.0.STABLE16/sr
  #include "ACLChecklist.h"
  #include "ACL.h"
  #if DELAY_POOLS
-@@ -1550,6 +1551,11 @@
+@@ -1549,6 +1550,11 @@
          /* guarantee nothing has been sent yet! */
          assert(http->out.size == 0);
          assert(http->out.offset == 0);
@@ -110,9 +110,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/client_side_reply.cc squid-3.0.STABLE16/sr
  
      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
+diff -Nru squid-3.0.STABLE19.orig/src/fde.h squid-3.0.STABLE19/src/fde.h
+--- squid-3.0.STABLE19.orig/src/fde.h	2009-09-06 13:29:38.000000000 +0200
++++ squid-3.0.STABLE19/src/fde.h	2009-09-12 07:26:48.000000000 +0200
 @@ -106,7 +106,7 @@
          long handle;
      } win32;
@@ -122,10 +122,10 @@ diff -Nru squid-3.0.STABLE16.orig/src/fde.h squid-3.0.STABLE16/src/fde.h
  };
  
  #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 @@
+diff -Nru squid-3.0.STABLE19.orig/src/forward.cc squid-3.0.STABLE19/src/forward.cc
+--- squid-3.0.STABLE19.orig/src/forward.cc	2009-09-06 13:29:38.000000000 +0200
++++ squid-3.0.STABLE19/src/forward.cc	2009-09-12 07:26:48.000000000 +0200
+@@ -965,6 +965,57 @@
  
      netdbPingSite(request->host);
  
@@ -158,7 +158,12 @@ diff -Nru squid-3.0.STABLE16.orig/src/forward.cc squid-3.0.STABLE16/src/forward.
 +	
 +	              if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
 +	              {
-+	            	  clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
++	            	  union {
++			     unsigned char *pchar;
++			     int  *pint;
++			  } data;
++			  data.pchar = CMSG_DATA(o);
++	            	  clientFde->upstreamTOS = (unsigned char)*data.pint;
 +	            	  break;
 +	              }
 +	              p += CMSG_LEN(o->cmsg_len);
@@ -178,9 +183,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/forward.cc squid-3.0.STABLE16/src/forward.
      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
+diff -Nru squid-3.0.STABLE19.orig/src/structs.h squid-3.0.STABLE19/src/structs.h
+--- squid-3.0.STABLE19.orig/src/structs.h	2009-09-06 13:29:38.000000000 +0200
++++ squid-3.0.STABLE19/src/structs.h	2009-09-12 07:26:48.000000000 +0200
 @@ -554,6 +554,8 @@
          int emailErrData;
          int httpd_suppress_version_string;
diff --git a/net-proxy/squid/files/squid-3.0.16-cross-compile.patch b/net-proxy/squid/files/squid-3.0.19-cross-compile.patch
index d1a43a2396dc..ba0d8d9e4fe5 100644
--- a/net-proxy/squid/files/squid-3.0.16-cross-compile.patch
+++ b/net-proxy/squid/files/squid-3.0.19-cross-compile.patch
@@ -1,6 +1,6 @@
-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
+diff -Nru squid-3.0.STABLE19.orig/configure.in squid-3.0.STABLE19/configure.in
+--- squid-3.0.STABLE19.orig/configure.in	2009-09-12 07:25:41.000000000 +0200
++++ squid-3.0.STABLE19/configure.in	2009-09-12 07:25:57.000000000 +0200
 @@ -1895,6 +1895,10 @@
  	;;
  esac
@@ -12,9 +12,9 @@ diff -Nru squid-3.0.STABLE16.orig/configure.in squid-3.0.STABLE16/configure.in
  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
+diff -Nru squid-3.0.STABLE19.orig/src/Makefile.am squid-3.0.STABLE19/src/Makefile.am
+--- squid-3.0.STABLE19.orig/src/Makefile.am	2009-09-12 07:25:41.000000000 +0200
++++ squid-3.0.STABLE19/src/Makefile.am	2009-09-12 07:25:57.000000000 +0200
 @@ -1011,6 +1011,8 @@
  
  DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
diff --git a/net-proxy/squid/files/squid-3.0.16-gentoo.patch b/net-proxy/squid/files/squid-3.0.19-gentoo.patch
index 1a788b519cdf..98cf2ed14d09 100644
--- a/net-proxy/squid/files/squid-3.0.16-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.19-gentoo.patch
@@ -1,6 +1,6 @@
-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
+diff -Nru squid-3.0.STABLE19.orig/acinclude.m4 squid-3.0.STABLE19/acinclude.m4
+--- squid-3.0.STABLE19.orig/acinclude.m4	2009-09-06 13:29:24.000000000 +0200
++++ squid-3.0.STABLE19/acinclude.m4	2009-09-12 07:25:05.000000000 +0200
 @@ -73,7 +73,7 @@
    AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
    AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
@@ -10,9 +10,9 @@ diff -Nru squid-3.0.STABLE16.orig/acinclude.m4 squid-3.0.STABLE16/acinclude.m4
  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
+diff -Nru squid-3.0.STABLE19.orig/configure.in squid-3.0.STABLE19/configure.in
+--- squid-3.0.STABLE19.orig/configure.in	2009-09-12 07:20:17.000000000 +0200
++++ squid-3.0.STABLE19/configure.in	2009-09-12 07:25:05.000000000 +0200
 @@ -15,9 +15,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -43,9 +43,9 @@ diff -Nru squid-3.0.STABLE16.orig/configure.in squid-3.0.STABLE16/configure.in
  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
+diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE19/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/confload.c	2009-09-06 13:29:29.000000000 +0200
++++ squid-3.0.STABLE19/helpers/basic_auth/MSNT/confload.c	2009-09-12 07:25:05.000000000 +0200
 @@ -27,7 +27,7 @@
  
  /* Path to configuration file */
@@ -55,9 +55,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.S
  #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
+diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE19/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-09-06 13:29:29.000000000 +0200
++++ squid-3.0.STABLE19/helpers/basic_auth/MSNT/msntauth.conf.default	2009-09-12 07:25:05.000000000 +0200
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -67,9 +67,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/basic_auth/MSNT/msntauth.conf.default
 +#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
+diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE19/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/Makefile.am	2009-09-06 13:29:30.000000000 +0200
++++ squid-3.0.STABLE19/helpers/basic_auth/SMB/Makefile.am	2009-09-12 07:25:05.000000000 +0200
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -79,9 +79,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.S
  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
+diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE19/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-09-06 13:29:30.000000000 +0200
++++ squid-3.0.STABLE19/helpers/basic_auth/SMB/smb_auth.sh	2009-09-12 07:25:06.000000000 +0200
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -100,9 +100,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.S
  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
+diff -Nru squid-3.0.STABLE19.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE19/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE19.orig/helpers/external_acl/session/squid_session.8	2009-09-06 13:29:30.000000000 +0200
++++ squid-3.0.STABLE19/helpers/external_acl/session/squid_session.8	2009-09-12 07:25:06.000000000 +0200
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -112,9 +112,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/external_acl/session/squid_session.8 s
  .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
+diff -Nru squid-3.0.STABLE19.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE19/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE19.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-09-06 13:29:30.000000000 +0200
++++ squid-3.0.STABLE19/helpers/external_acl/unix_group/squid_unix_group.8	2009-09-12 07:25:06.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
@@ -124,9 +124,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/external_acl/unix_group/squid_unix_gro
  .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
+diff -Nru squid-3.0.STABLE19.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE19/helpers/negotiate_auth/squid_kerb_auth/do.sh
+--- squid-3.0.STABLE19.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-09-06 13:29:33.000000000 +0200
++++ squid-3.0.STABLE19/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-09-12 07:25:06.000000000 +0200
 @@ -7,7 +7,7 @@
  #
  CC=gcc
@@ -136,9 +136,9 @@ diff -Nru squid-3.0.STABLE16.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh s
  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
+diff -Nru squid-3.0.STABLE19.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE19/lib/libTrie/acinclude.m4
+--- squid-3.0.STABLE19.orig/lib/libTrie/acinclude.m4	2009-09-06 13:29:34.000000000 +0200
++++ squid-3.0.STABLE19/lib/libTrie/acinclude.m4	2009-09-12 07:25:06.000000000 +0200
 @@ -9,7 +9,7 @@
    AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
    AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
@@ -148,9 +148,9 @@ diff -Nru squid-3.0.STABLE16.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE16/li
  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
+diff -Nru squid-3.0.STABLE19.orig/lib/libTrie/configure.in squid-3.0.STABLE19/lib/libTrie/configure.in
+--- squid-3.0.STABLE19.orig/lib/libTrie/configure.in	2009-09-06 13:29:35.000000000 +0200
++++ squid-3.0.STABLE19/lib/libTrie/configure.in	2009-09-12 07:25:06.000000000 +0200
 @@ -58,8 +58,8 @@
  
  dnl set useful flags
@@ -162,9 +162,9 @@ diff -Nru squid-3.0.STABLE16.orig/lib/libTrie/configure.in squid-3.0.STABLE16/li
  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
+diff -Nru squid-3.0.STABLE19.orig/src/cf.data.pre squid-3.0.STABLE19/src/cf.data.pre
+--- squid-3.0.STABLE19.orig/src/cf.data.pre	2009-09-06 13:29:37.000000000 +0200
++++ squid-3.0.STABLE19/src/cf.data.pre	2009-09-12 07:25:06.000000000 +0200
 @@ -652,6 +652,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -218,9 +218,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/cf.data.pre squid-3.0.STABLE16/src/cf.data
  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
+diff -Nru squid-3.0.STABLE19.orig/src/debug.cc squid-3.0.STABLE19/src/debug.cc
+--- squid-3.0.STABLE19.orig/src/debug.cc	2009-09-06 13:29:37.000000000 +0200
++++ squid-3.0.STABLE19/src/debug.cc	2009-09-12 07:25:06.000000000 +0200
 @@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -230,9 +230,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/debug.cc squid-3.0.STABLE16/src/debug.cc
  
  #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
+diff -Nru squid-3.0.STABLE19.orig/src/defines.h squid-3.0.STABLE19/src/defines.h
+--- squid-3.0.STABLE19.orig/src/defines.h	2009-09-06 13:29:37.000000000 +0200
++++ squid-3.0.STABLE19/src/defines.h	2009-09-12 07:25:06.000000000 +0200
 @@ -218,7 +218,7 @@
  
  /* were to look for errors if config path fails */
@@ -242,9 +242,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/defines.h squid-3.0.STABLE16/src/defines.h
  #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
+diff -Nru squid-3.0.STABLE19.orig/src/main.cc squid-3.0.STABLE19/src/main.cc
+--- squid-3.0.STABLE19.orig/src/main.cc	2009-09-06 13:29:38.000000000 +0200
++++ squid-3.0.STABLE19/src/main.cc	2009-09-12 07:25:06.000000000 +0200
 @@ -1490,7 +1490,7 @@
      if (*(argv[0]) == '(')
          return;
@@ -272,9 +272,9 @@ diff -Nru squid-3.0.STABLE16.orig/src/main.cc squid-3.0.STABLE16/src/main.cc
  
          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
+diff -Nru squid-3.0.STABLE19.orig/src/Makefile.am squid-3.0.STABLE19/src/Makefile.am
+--- squid-3.0.STABLE19.orig/src/Makefile.am	2009-09-06 13:29:36.000000000 +0200
++++ squid-3.0.STABLE19/src/Makefile.am	2009-09-12 07:25:06.000000000 +0200
 @@ -995,12 +995,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/squid-2.7.6-r1.ebuild b/net-proxy/squid/squid-2.7.6-r1.ebuild
deleted file mode 100644
index 365e4dced1e1..000000000000
--- a/net-proxy/squid/squid-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,189 +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-2.7.6-r1.ebuild,v 1.10 2009/08/16 11:01:46 mrness Exp $
-
-EAPI="2"
-
-inherit eutils pam toolchain-funcs autotools
-
-#lame archive versioning scheme..
-S_PMV="${PV%%.*}"
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="caps pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
-	mysql postgres sqlite \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux +epoll"
-
-DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	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 use zero-penalty-hit; then
-		ewarn "This version supports natively IP TOS/Priority mangling,"
-		ewarn "but it does not support zph_preserve_miss_tos."
-		ewarn "If you need that, please use >=${CATEGORY}/${PN}-3 ."
-	fi
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-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_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}"
-	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=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter
-			$(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 \
-		--enable-auth="basic,digest,ntlm,negotiate" \
-		--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-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		--with-maxfd=8192 \
-		$(use_enable caps) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		${myconf} || die "econf failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}
diff --git a/net-proxy/squid/squid-3.0.16.ebuild b/net-proxy/squid/squid-3.0.16.ebuild
deleted file mode 100644
index 0f224fab6da7..000000000000
--- a/net-proxy/squid/squid-3.0.16.ebuild
+++ /dev/null
@@ -1,193 +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.16.ebuild,v 1.8 2009/07/23 06:57:45 mrness Exp $
-
-EAPI="2"
-
-inherit eutils pam toolchain-funcs autotools
-
-# 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="caps 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="caps? ( >=sys-libs/libcap-2.16 )
-	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 caps) \
-		$(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.18.ebuild b/net-proxy/squid/squid-3.0.19.ebuild
index f78bbc813ed2..ee548b2ac69d 100644
--- a/net-proxy/squid/squid-3.0.18.ebuild
+++ b/net-proxy/squid/squid-3.0.19.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.18.ebuild,v 1.8 2009/08/16 11:01:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.19.ebuild,v 1.1 2009/09/12 06:34:48 mrness Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \