Add development version.

Package-Manager: portage-2.1.2.12

5 files changed, 422 insertions, 8 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 47e6eefaa1d0..94e2568969e3 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.152 2007/09/08 07:28:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.153 2007/09/09 05:34:27 mrness Exp $
+
+*squid-3.0_pre7 (09 Sep 2007)
+
+  09 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  +files/squid-3.0_pre7-gentoo.patch, +squid-3.0_pre7.ebuild:
+  Add development version.
 
 *squid-2.6.16 (08 Sep 2007)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c5368c1c642f..b5dca54c0d13 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -45,6 +45,10 @@ AUX squid-2.6.16-qos.patch 10046 RMD160 666d39b49e37413de8f0b3ff31ad181a2251d0b4
 MD5 2ffc70e0a1b7b74094e87e13008b527c files/squid-2.6.16-qos.patch 10046
 RMD160 666d39b49e37413de8f0b3ff31ad181a2251d0b4 files/squid-2.6.16-qos.patch 10046
 SHA256 37f34b454ae1955d7a1da239475f1126a2a65f7a7f4bd32bdc13359de5ea09bf files/squid-2.6.16-qos.patch 10046
+AUX squid-3.0_pre7-gentoo.patch 8825 RMD160 ad379e65a61082fe3106f69003e463d06b77f3df SHA1 31f01eeff8f6535943568465bbc95536c2832e28 SHA256 16c187e356df3b0a4afcaf41809068c53d91038b971303bc9cba4ce7b0204f29
+MD5 d023d2bf4dd1a7fe670a049b7bf36e65 files/squid-3.0_pre7-gentoo.patch 8825
+RMD160 ad379e65a61082fe3106f69003e463d06b77f3df files/squid-3.0_pre7-gentoo.patch 8825
+SHA256 16c187e356df3b0a4afcaf41809068c53d91038b971303bc9cba4ce7b0204f29 files/squid-3.0_pre7-gentoo.patch 8825
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
@@ -77,6 +81,7 @@ DIST squid-2.6.STABLE12.tar.gz 1626994 RMD160 8e9463969064312b5f2fbe83b039be0964
 DIST squid-2.6.STABLE13.tar.gz 1627479 RMD160 6a01a10482ed1ce9715ae89905629472103bd394 SHA1 6e5783c928325b3652a5a7ffb5b167318d5937f1 SHA256 1c32265ec15af7cfa28dec12f356c9abcb1c38ecf97de263674bb61732d4076b
 DIST squid-2.6.STABLE14.tar.gz 1694713 RMD160 53efeb4db8f118fe336970599ea97f963234f620 SHA1 860fc6cada0a91f93b85e725367219f3815cb86e SHA256 c2e9465ca3cf77efb0d625a9b2bc1ffed52b9b674c1d84d50ddf36b9a24874b0
 DIST squid-2.6.STABLE16.tar.gz 1710035 RMD160 a6a1de36baf28c36916e09a713ca30d33a10054a SHA1 6e56df7270512f9676b20a4d9e5a96f675aa0d23 SHA256 0326bd0bb36d9f19349b5e103f94f675bd4ead225766645035b7bec7452fe72f
+DIST squid-3.0.PRE7.tar.gz 2379458 RMD160 b586c392f9d7e5884edd6b40babe352e864abe06 SHA1 25fc030750c1b4d90dfe1204399a8bc4d7a79bab SHA256 85fee652ab1886cb1bb5802173d2467db73548afae69e9f1a7eb8f7a2acef0f3
 EBUILD squid-2.6.12.ebuild 6135 RMD160 47895fbd209fb6d2b8f47e9214a82647332744ae SHA1 b06a5ee4b832214e5ed51f834e68d3ab0b11e0e2 SHA256 d336b2c5797cd9f73f382217a612a8869d45b35d93ec4abdd6a8bb47719b6e89
 MD5 67dd998ba1081c2335b89283dca076b4 squid-2.6.12.ebuild 6135
 RMD160 47895fbd209fb6d2b8f47e9214a82647332744ae squid-2.6.12.ebuild 6135
@@ -93,10 +98,14 @@ EBUILD squid-2.6.16.ebuild 5892 RMD160 e49c09f985a9c39b6c85e8accd41f24c7730c96d
 MD5 8f7187198f55f7f9db6005983f5cecde squid-2.6.16.ebuild 5892
 RMD160 e49c09f985a9c39b6c85e8accd41f24c7730c96d squid-2.6.16.ebuild 5892
 SHA256 211c9cb526c2158f44b265ca3c5b90f10328090cc4d4bae8e086e48220898395 squid-2.6.16.ebuild 5892
-MISC ChangeLog 36760 RMD160 405cdef32ffd3a5f8e9e75e6d13d4d60b0202ef7 SHA1 e1b163e573a476986c01955007687a999c1eb3e6 SHA256 d27fdc14c557ce96a2c5ee3c98fc1f8c45b3b042be1a6d0bdcd20283b08b9f47
-MD5 f90bdd41d88dc81a55f618921fc46c89 ChangeLog 36760
-RMD160 405cdef32ffd3a5f8e9e75e6d13d4d60b0202ef7 ChangeLog 36760
-SHA256 d27fdc14c557ce96a2c5ee3c98fc1f8c45b3b042be1a6d0bdcd20283b08b9f47 ChangeLog 36760
+EBUILD squid-3.0_pre7.ebuild 5691 RMD160 ecd9a9a073b72f1f784cf32b6907b653a51bd78a SHA1 c5388c9f9225af47e38b2ff0faae3bac0f508db0 SHA256 cdf93ec4152c5f8702b3e2210893ed3c191062facac14a74a8f37dc2d80e1280
+MD5 7e4d4e23b3c123e63439cb95967b50ee squid-3.0_pre7.ebuild 5691
+RMD160 ecd9a9a073b72f1f784cf32b6907b653a51bd78a squid-3.0_pre7.ebuild 5691
+SHA256 cdf93ec4152c5f8702b3e2210893ed3c191062facac14a74a8f37dc2d80e1280 squid-3.0_pre7.ebuild 5691
+MISC ChangeLog 36929 RMD160 76cc6aac93fa990c491a78f9d8dccf81edf358bc SHA1 4ad9b982da5376039977fa589ce4177d6f0efe73 SHA256 1a4ce86f7656d0aef0bda192f026958aeb5fb43fe197ce287d46ea1034127a92
+MD5 75359cfc9d5e26aba60e09c477c87a2e ChangeLog 36929
+RMD160 76cc6aac93fa990c491a78f9d8dccf81edf358bc ChangeLog 36929
+SHA256 1a4ce86f7656d0aef0bda192f026958aeb5fb43fe197ce287d46ea1034127a92 ChangeLog 36929
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -113,10 +122,13 @@ SHA256 b427b2ba0ad5c8b631cda9ffc416f45288059d5b360e4ab7bbe1e3f8a0d7bba3 files/di
 MD5 fa2f14f6d7e89d24c2e3c899999b2a76 files/digest-squid-2.6.16 259
 RMD160 acb3252c918f51ed5e882b8ef33ce3308d2c8b0b files/digest-squid-2.6.16 259
 SHA256 80546f861de16ea8e1fc9d6d13b73994676a14d773f7d97c3d69f74ebbd6ca1f files/digest-squid-2.6.16 259
+MD5 2e31b6f7e3cf16abe87d304e4d24c296 files/digest-squid-3.0_pre7 247
+RMD160 05eed3dfb759d25b5b7937dac3d4da9f65fb6b70 files/digest-squid-3.0_pre7 247
+SHA256 3f8f750c297d8cd7b4970fa73c9915f04203f375aac20646bec5be2afc7d9925 files/digest-squid-3.0_pre7 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG4lQzVSA5X31g7/gRAuzLAJ0QbYTFq6oCfIGEV5ciK91hH0YovgCgiHvt
-T/gO28RjTMq3xAaDv/4EXBQ=
-=G7bB
+iD8DBQFG44XyVSA5X31g7/gRAgOxAJ42TRvfLRUM8VB6bacEAmF2N03NtwCfauCQ
+xtOgJS9Inw67UUV7Z7uy764=
+=gALu
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-3.0_pre7 b/net-proxy/squid/files/digest-squid-3.0_pre7
new file mode 100644
index 000000000000..12ab5b5324c7
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-3.0_pre7
@@ -0,0 +1,3 @@
+MD5 91c49bf6be5752f26a761ed8d3667755 squid-3.0.PRE7.tar.gz 2379458
+RMD160 b586c392f9d7e5884edd6b40babe352e864abe06 squid-3.0.PRE7.tar.gz 2379458
+SHA256 85fee652ab1886cb1bb5802173d2467db73548afae69e9f1a7eb8f7a2acef0f3 squid-3.0.PRE7.tar.gz 2379458
diff --git a/net-proxy/squid/files/squid-3.0_pre7-gentoo.patch b/net-proxy/squid/files/squid-3.0_pre7-gentoo.patch
new file mode 100644
index 000000000000..1f7c915444c0
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0_pre7-gentoo.patch
@@ -0,0 +1,210 @@
+diff -Nru squid-3.0.PRE7.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.PRE7/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.PRE7.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 22:09:48.000000000 +0300
++++ squid-3.0.PRE7/helpers/basic_auth/MSNT/confload.c	2007-09-08 23:25:15.000000000 +0300
+@@ -24,7 +24,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.PRE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.PRE7/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.PRE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 21:44:28.000000000 +0300
++++ squid-3.0.PRE7/helpers/basic_auth/MSNT/msntauth.conf.default	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.PRE7/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.PRE7.orig/helpers/basic_auth/SMB/Makefile.am	2003-01-23 02:35:40.000000000 +0200
++++ squid-3.0.PRE7/helpers/basic_auth/SMB/Makefile.am	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.PRE7/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.PRE7.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
++++ squid-3.0.PRE7/helpers/basic_auth/SMB/smb_auth.sh	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/external_acl/session/squid_session.8 squid-3.0.PRE7/helpers/external_acl/session/squid_session.8
+--- squid-3.0.PRE7.orig/helpers/external_acl/session/squid_session.8	2007-06-25 14:31:46.000000000 +0300
++++ squid-3.0.PRE7/helpers/external_acl/session/squid_session.8	2007-09-08 23:25:15.000000000 +0300
+@@ -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.PRE7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.PRE7/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.PRE7.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-05 15:44:26.000000000 +0300
++++ squid-3.0.PRE7/helpers/external_acl/unix_group/squid_unix_group.8	2007-09-08 23:32:29.000000000 +0300
+@@ -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.PRE7.orig/src/cf.data.pre squid-3.0.PRE7/src/cf.data.pre
+--- squid-3.0.PRE7.orig/src/cf.data.pre	2007-08-30 16:03:42.000000000 +0300
++++ squid-3.0.PRE7/src/cf.data.pre	2007-09-08 23:26:07.000000000 +0300
+@@ -2806,6 +2806,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
+@@ -2839,6 +2841,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
+@@ -2857,6 +2862,9 @@
+ #acl our_networks src 192.168.1.0/24 192.168.2.0/24
+ #http_access allow our_networks
+ 
++# 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
+@@ -3144,11 +3152,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
+@@ -5036,6 +5044,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.PRE7.orig/src/debug.cc squid-3.0.PRE7/src/debug.cc
+--- squid-3.0.PRE7.orig/src/debug.cc	2007-08-02 02:04:23.000000000 +0300
++++ squid-3.0.PRE7/src/debug.cc	2007-09-08 23:22:22.000000000 +0300
+@@ -462,7 +462,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.PRE7.orig/src/defines.h squid-3.0.PRE7/src/defines.h
+--- squid-3.0.PRE7.orig/src/defines.h	2007-08-13 20:20:51.000000000 +0300
++++ squid-3.0.PRE7/src/defines.h	2007-09-08 23:25:15.000000000 +0300
+@@ -219,7 +219,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.PRE7.orig/src/main.cc squid-3.0.PRE7/src/main.cc
+--- squid-3.0.PRE7.orig/src/main.cc	2007-06-18 01:08:48.000000000 +0300
++++ squid-3.0.PRE7/src/main.cc	2007-09-08 23:22:08.000000000 +0300
+@@ -1471,7 +1471,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());
+@@ -1515,7 +1515,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);
+@@ -1523,7 +1523,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.PRE7.orig/src/Makefile.am squid-3.0.PRE7/src/Makefile.am
+--- squid-3.0.PRE7.orig/src/Makefile.am	2007-08-27 00:04:32.000000000 +0300
++++ squid-3.0.PRE7/src/Makefile.am	2007-09-08 23:25:15.000000000 +0300
+@@ -984,12 +984,12 @@
+ DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
+ DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
+ DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
+-DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
++DEFAULT_LOG_PREFIX	= $(localstatedir)/log/squid
+ DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
+ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
+ DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
+-DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
+-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
++DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
++DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
+ DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/squid-3.0_pre7.ebuild b/net-proxy/squid/squid-3.0_pre7.ebuild
new file mode 100644
index 000000000000..b7ccf7f685d8
--- /dev/null
+++ b/net-proxy/squid/squid-3.0_pre7.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0_pre7.ebuild,v 1.1 2007/09/09 05:34:27 mrness Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
+
+#lame archive versioning scheme..
+S_PMV="${PV%%.*}"
+S_PV="${PV%_*}"
+S_PL="${PV#*_pre}"
+S_PP="${PN}-${S_PV}.PRE${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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam ldap samba sasl nis radius ssl snmp selinux logrotate \
+	pf-transparent ipf-transparent \
+	elibc_uclibc kernel_linux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? ( >=net-nds/openldap-2.3.35 )
+	ssl? ( >=dev-libs/openssl-0.9.8d )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.22 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl"
+RDEPEND="${DEPEND}
+	samba? ( net-fs/samba )"
+
+S="${WORKDIR}/${S_PP}"
+
+pkg_setup() {
+	if hasq qos ${USE} || hasq zero-penalty-hit ${USE} ; then
+		eerror "qos and zero-penalty-hit useflags are not supported by squid-3."
+		eerror "Please remove them from your USE or use =net-proxy/squid-2.6* instead."
+		die "unsupported USE flags detected"
+	fi
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd "${S}" || die "dir ${S} not found"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
+
+	eautoreconf
+}
+
+src_compile() {
+	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}"
+
+	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 myconf=""
+
+	# Support for uclibc #61175
+	if use elibc_uclibc; then
+		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
+	else
+		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
+	fi
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter"
+	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		myconf="${myconf} --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-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-large-files \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		${myconf} || die "econf failed"
+
+	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
+		include/autoconf.h
+
+	emake || die "emake 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.1" 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_preinst() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid 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}"
+}