Remove obsolete versions. Version bump (#284211).

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

8 files changed, 107 insertions, 465 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/Manifest b/net-proxy/squid/Manifest
index f830328b5a81..5ea4a68dc650 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,15 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2-capability.patch 970 RMD160 01edc052d32b6531e6db93ff1addef91e193c6df SHA1 533bff849dbcbfb2d85c4a995eaea6585a593fd7 SHA256 4e0cef8fc9643e7b4922c510bf25fbd902eaeaec0846eb49a809229ab75b21c6
 AUX squid-2.7.6-cve-2009-2855.patch 1117 RMD160 4d04db9e091725eab9dfd51870ef353fcd9ddd9a SHA1 ac1e88120322b1143d06ab4efe97552aaa3e0fa8 SHA256 203a0ceb25bb99894ad0180f5676daa9c5b4c51a3d76112fa0c3e669db278e24
 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.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.0.18-adapted-zph.patch 6951 RMD160 98fea60cf9f5a59d1c0370d391929c2fddcfdbb9 SHA1 72ee5c76ed8c9f819e9630ad0caf221fa769e1cc SHA256 41474df7c263997dcebfddfe58745eb7861eb53296241319b2f6837134f8204f
 AUX squid-3.0.18-cross-compile.patch 1234 RMD160 a810657fc4d069d2ded4c59fd7a0ca0e1f4d3bdd SHA1 3368c7d88400894ce30c23c68fa026bee4dfa187 SHA256 628193bc75e2e3cda978636cf6ece1e99f07ed825ce66a3064ec1cb99c760758
 AUX squid-3.0.18-cve-2009-2855.patch 1165 RMD160 a0d31cf6b220d9d35f73c464e2ae0fcf35861177 SHA1 1a24453aef88c3cc3249d410baa4c3dccd1a0eba SHA256 590254fb997f3a79e2d9804149eeacd83a2b81919981de269b524e1c6e4a70ff
 AUX squid-3.0.18-gentoo.patch 13095 RMD160 a051aadf18dd2a902d174ac638acb01a12a289b6 SHA1 f30fe36d7e381cc01c3964e1bd743348b90e9717 SHA256 3d4c07d499c1de4895e2a78fb0f90ff4f1d6859d0c2b92300b43a287318b0f74
+AUX squid-3.0.19-adapted-zph.patch 6951 RMD160 70c29454281d31a90093199eac410fd539f98dbc SHA1 5c4a381161bc2a3908d8c941a6f7494184b0a01b SHA256 33d17e6241aa4ce240d98f068a6839b639d78ce5cba4b7be91b0761d25d7e1d3
+AUX squid-3.0.19-cross-compile.patch 1234 RMD160 211ac61245bcf4bc7bbdac69fe49a671d46cd919 SHA1 22b6c343f672c9ac70a92910564b7f398e846024 SHA256 74927a2ebf39b8da29baf4f8cd12ee67034dcde29a28966fd7b0d51573610ee2
+AUX squid-3.0.19-gentoo.patch 13095 RMD160 579701b8461fc340181e89d1f27f52473a3a7c26 SHA1 926b5e44a3e3b129ccb955e570af4caa856b7697 SHA256 af1e67885e531a47d74c672e3ef94095e25d6f3b35d5c12395f1b41a03bb30a2
 AUX squid-3.1.0.13_beta-cve-2009-2855.patch 1159 RMD160 a45298f835852e1a3cfc793ea3a81569c24fe87b SHA1 c329b19f632652bd7f6c36e36b793ebdf8551097 SHA256 30e03878fead8aad19ce3739bddce6c42d62ea572feb6a4387393e24b92ee580
 AUX squid-3.1.0.13_beta-gentoo.patch 12746 RMD160 c231d5ff2fa0f925f040575d758d8ea145124436 SHA1 0a2b8149b88a40710b877cb68ce70451dd9654a1 SHA256 191305a90a663742ce04f2d05a8a15ee79c429906a323da18d52c90a266ff9f1
 AUX squid-3.1.0.13_beta-qafixes.patch 3996 RMD160 5987f180c321749d7b92e2e6d7c0e8aedfbc63b5 SHA1 0edd1ea0c848b4dacf5f1b55bd3e585afb0592e7 SHA256 4a2b15985716c305e2ea76acbea4cf692f7ee0ba0ef43658be171cbe039c2186
@@ -20,14 +23,19 @@ AUX squid.initd-logrotate 2162 RMD160 7e381b07e6784b4c682f8d241ab865a1a49c3171 S
 AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8b3c43c0d327150069a65aa473302ae6c423ff SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6
 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.STABLE16.tar.gz 2449986 RMD160 d9e019ef5c2fb26f0a16a9bfbce5fe0269360ab1 SHA1 3d0ba0e509b7939b9023f1b25cc956e4ac3c0ba1 SHA256 a50c9d1d276f59a2754f13c27468445290930c000cb1457160bfe8898620b615
 DIST squid-3.0.STABLE18.tar.gz 2451806 RMD160 58858b1b8fb2d34ce482a6001b950b0aa5c87a2c SHA1 5855ecaf6f427ec95f52848efd679ea1bdd2c304 SHA256 71e74c48a19b901d1b4dd8fcbfa15c6b510befa524929a63ecef6a9ef5699d85
+DIST squid-3.0.STABLE19.tar.gz 2450451 RMD160 33a2fc1ace6ae4319ba32c781418965e91bf244e SHA1 70bb80c3e32484f3ec2c92a72c256dec133d616b SHA256 6930df9063e3f2d9211ea38e79ed3a1ac93bc0126fcff5340caf178f130a8dd5
 DIST squid-3.1.0.13.tar.gz 3247124 RMD160 263a42af1ff2d9a967862f77389f9bd3bd6b9b2e SHA1 bfe7ea82b67d07211ae3221920aad87424444f30 SHA256 f4e7c3933575f86072220863f38a6f8d1923ab4b8954a38e06248fc80a0dec00
-EBUILD squid-2.7.6-r1.ebuild 5993 RMD160 4106abd174f303e5e538bc563cdebc94ed46cbcd SHA1 ebb00af7b12445ec38e2453c49b7a210784b3ca5 SHA256 0303997e63bcf8906a189cb157cf5d455a346890448c51ce2d632d41f07efcf3
 EBUILD squid-2.7.6-r2.ebuild 6039 RMD160 b5355c33e3a7b9dce57f75da87da71854d880321 SHA1 aac17f4c96fd9e104d595f8ceadf0c6799284aac SHA256 7873717f430431b12c5405fadd7fa3e62d6374991cb077f6b53e43dbec9e9d92
-EBUILD squid-3.0.16.ebuild 6388 RMD160 5b86c3b092be1d2c562fe80a0a1a7523ed4d0127 SHA1 0ba223321aa91b229f2bc0ecd72612193517bb98 SHA256 d7ed3f17996b1cf3aac97709301d8bc14d07075318893500d497797313fd5f5c
 EBUILD squid-3.0.18-r1.ebuild 6438 RMD160 3f2e0054891d77062da0445e95a60281ab3ab878 SHA1 ad8cb75bf4d0b44c6943de10d4f98f5bee64b451 SHA256 69bb7ef4a8c789e061955e69aeb7d9ca20fb29c2b5764211532a8bd34cbea580
-EBUILD squid-3.0.18.ebuild 6389 RMD160 bdb8f7878af2c334c17c2bf9c195c85db0b03d38 SHA1 f1963803a04cb5f67d0d864f357791848c79ce59 SHA256 51a7efd863d0f8d228fd1bf5992b606e64f7e7e26fad4f057cdc448f81d5df46
+EBUILD squid-3.0.19.ebuild 6397 RMD160 5da0e96af88034dd79f189b4f7cdc2b46de52394 SHA1 a10e3c993d6021535522d9dcf351d29ad3e307db SHA256 eb8e057287c8cc6f2272496439cfddc0b7dbc0d2130dbdbead32d3ca1c38a7a8
 EBUILD squid-3.1.0.13_beta-r1.ebuild 6638 RMD160 516a8f26627ff6cd94862831b368ab3a4bef0236 SHA1 1d7b00f0f1be808e38e7d08edb08354302d417a2 SHA256 36ab5d0b147708d55da86da85ce0c504d9e472a1a3d4a61f9b69bd9058a55e3f
-MISC ChangeLog 60760 RMD160 939bc2b2b7a0d880b0283b634699d4bd903fab81 SHA1 3887d57fe1425889b0071a160bb8f1e2e24bbced SHA256 d41049fed3ebfb4abdedfd20547cfc2d06ccfe6960dbe307bf4aaccc7233c46d
+MISC ChangeLog 61220 RMD160 ec01a4709ddfc83e0a62956697d9b93b0e4bfe95 SHA1 a80aaf217e8160e3ba37788f75024b4c080669bc SHA256 c25bbe071406a17e979a7844cd3370fc9b8d7256f97c896924bf4967a66aad69
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqrQRIACgkQ9A5kJBGSrsvFcwCdH3d5me0bRphdQ7LZip4ZoM7t
+5NkAn2QSM9Go2hM+Y0mHLvUvwIAiCldX
+=w3L8
+-----END PGP SIGNATURE-----
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 \