$DEBUG -> use debug

19 files changed, 27 insertions, 1270 deletions

diff --git a/net-www/mozilla/mozilla-1.0.1-r3.ebuild b/net-www/mozilla/mozilla-1.0.1-r3.ebuild
index 744fa37f1e5f..1c61592d14f7 100644
--- a/net-www/mozilla/mozilla-1.0.1-r3.ebuild
+++ b/net-www/mozilla/mozilla-1.0.1-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r3.ebuild,v 1.8 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r3.ebuild,v 1.9 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="mozxmlterm moznomail java mozp3p crypt ipv6 gtk2 mozinterfaceinfo ssl ldap mozaccess mozctl gnome mozsvg"
+IUSE="mozxmlterm moznomail java mozp3p crypt ipv6 gtk2 mozinterfaceinfo ssl ldap mozaccess mozctl gnome mozsvg debug"
 
 # NOTE: to build without the mail and news component:  export NO_MAIL="YES"
 inherit flag-o-matic gcc makeedit eutils nsplugins
@@ -171,7 +171,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ -z "${DEBUG}" ] ; then
+	if [ -z "`use debug`" ] ; then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
 			              --disable-tests"
diff --git a/net-www/mozilla/mozilla-1.1-r1.ebuild b/net-www/mozilla/mozilla-1.1-r1.ebuild
index 40266996f4d8..3b40d2d32c68 100644
--- a/net-www/mozilla/mozilla-1.1-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1-r1.ebuild,v 1.17 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1-r1.ebuild,v 1.18 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="moznomail java mozp3p crypt ldap gtk2 mozinterfaceinfo ssl mozaccess mozxmlterm mozctl gnome mozsvg"
+IUSE="moznomail java mozp3p crypt ldap gtk2 mozinterfaceinfo ssl mozaccess mozxmlterm mozctl gnome mozsvg debug"
 
 # NOTE: to build without the mail and news component:  export NO_MAIL="YES"
 inherit flag-o-matic makeedit nsplugins
@@ -147,7 +147,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ -z "${DEBUG}" ] ; then
+	if [ -z "`use debug`" ] ; then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
 			              --disable-dtd-debug \
diff --git a/net-www/mozilla/mozilla-1.2.1-r5.ebuild b/net-www/mozilla/mozilla-1.2.1-r5.ebuild
index 97ba09da1053..75a9cd7432a4 100644
--- a/net-www/mozilla/mozilla-1.2.1-r5.ebuild
+++ b/net-www/mozilla/mozilla-1.2.1-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.1-r5.ebuild,v 1.9 2003/04/06 03:06:26 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.1-r5.ebuild,v 1.10 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} mozsvg mozcalendar mozaccess mozinterfaceinfo mozp3p mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
@@ -260,7 +260,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ "${DEBUGBUILD}" != "yes" ]
+	if [ -z "`use debug`" ]
 	then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
diff --git a/net-www/mozilla/mozilla-1.3-r2.ebuild b/net-www/mozilla/mozilla-1.3-r2.ebuild
index 9ce4cc5a496d..8eb071ff56b4 100644
--- a/net-www/mozilla/mozilla-1.3-r2.ebuild
+++ b/net-www/mozilla/mozilla-1.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.3-r2.ebuild,v 1.6 2003/07/17 15:37:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.3-r2.ebuild,v 1.7 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} mozsvg mozcalendar mozaccess mozinterfaceinfo mozp3p mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
@@ -199,7 +199,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ "${DEBUGBUILD}" != "yes" ]
+	if [ -z "`use debug`" ]
 	then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
diff --git a/net-www/mozilla/mozilla-1.4-r1.ebuild b/net-www/mozilla/mozilla-1.4-r1.ebuild
index 22bf0feb2cf8..9a776c731d00 100644
--- a/net-www/mozilla/mozilla-1.4-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r1.ebuild,v 1.3 2003/07/24 17:57:50 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r1.ebuild,v 1.4 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} mozsvg mozcalendar mozaccess mozp3p mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
@@ -182,7 +182,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ "${DEBUGBUILD}" != "yes" ]
+	if [ -z "`use debug`" ]
 	then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
diff --git a/net-www/mozilla/mozilla-1.4-r2.ebuild b/net-www/mozilla/mozilla-1.4-r2.ebuild
index 84ce1edf5580..5460cbc882c9 100644
--- a/net-www/mozilla/mozilla-1.4-r2.ebuild
+++ b/net-www/mozilla/mozilla-1.4-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r2.ebuild,v 1.4 2003/07/30 17:50:24 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r2.ebuild,v 1.5 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} mozsvg mozcalendar mozaccess mozp3p mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
@@ -183,7 +183,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ "${DEBUGBUILD}" != "yes" ]
+	if [ -z "`use debug`" ]
 	then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
diff --git a/net-www/mozilla/mozilla-1.4-r3.ebuild b/net-www/mozilla/mozilla-1.4-r3.ebuild
index d9b1e7e65509..a043565a5978 100644
--- a/net-www/mozilla/mozilla-1.4-r3.ebuild
+++ b/net-www/mozilla/mozilla-1.4-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r3.ebuild,v 1.1 2003/07/31 16:19:17 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r3.ebuild,v 1.2 2003/08/03 04:23:43 vapier Exp $
 
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
+IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} mozsvg mozcalendar mozaccess mozp3p mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
@@ -183,7 +183,7 @@ src_compile() {
 		myconf="${myconf} --disable-ldap"
 	fi
 
-	if [ "${DEBUGBUILD}" != "yes" ]
+	if [ -z "`use debug`" ]
 	then
 		myconf="${myconf} --enable-strip-libs \
 			              --disable-debug \
diff --git a/net-www/squid/files/digest-squid-2.5.1 b/net-www/squid/files/digest-squid-2.5.1
deleted file mode 100644
index 71ee1aa5cce7..000000000000
--- a/net-www/squid/files/digest-squid-2.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c83e3f4f0313529a2bc4b5dd6f651544 squid-2.5.STABLE1.tar.bz2 1006600
diff --git a/net-www/squid/files/digest-squid-2.5.1-r1 b/net-www/squid/files/digest-squid-2.5.1-r1
deleted file mode 100644
index 71ee1aa5cce7..000000000000
--- a/net-www/squid/files/digest-squid-2.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c83e3f4f0313529a2bc4b5dd6f651544 squid-2.5.STABLE1.tar.bz2 1006600
diff --git a/net-www/squid/files/digest-squid-2.5.1-r2 b/net-www/squid/files/digest-squid-2.5.1-r2
deleted file mode 100644
index 71ee1aa5cce7..000000000000
--- a/net-www/squid/files/digest-squid-2.5.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c83e3f4f0313529a2bc4b5dd6f651544 squid-2.5.STABLE1.tar.bz2 1006600
diff --git a/net-www/squid/files/digest-squid-2.5.2 b/net-www/squid/files/digest-squid-2.5.2
deleted file mode 100644
index 32c29ea243a9..000000000000
--- a/net-www/squid/files/digest-squid-2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4096165619f92847edf34906ad9467b squid-2.5.STABLE2.tar.bz2 1020696
diff --git a/net-www/squid/files/squid-2.5.1-gentoo.diff b/net-www/squid/files/squid-2.5.1-gentoo.diff
deleted file mode 100644
index 1e81e5113d27..000000000000
--- a/net-www/squid/files/squid-2.5.1-gentoo.diff
+++ /dev/null
@@ -1,332 +0,0 @@
-diff -uNr squid-2.5.STABLE1.orig/errors/Makefile.in squid-2.5.STABLE1/errors/Makefile.in
---- squid-2.5.STABLE1.orig/errors/Makefile.in	2002-07-12 04:38:03.000000000 -0400
-+++ squid-2.5.STABLE1/errors/Makefile.in	2002-11-07 01:37:34.000000000 -0500
-@@ -119,7 +119,7 @@
- install_sh = @install_sh@
- makesnmplib = @makesnmplib@
- 
--errordir = $(datadir)/errors
-+errordir = $(libexecdir)/errors
- 
- DEFAULT_ERROR_DIR = $(errordir)
- 
-diff -uNr squid-2.5.STABLE1.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE1/helpers/basic_auth/SMB/Makefile.in
---- squid-2.5.STABLE1.orig/helpers/basic_auth/SMB/Makefile.in	2002-08-11 21:17:26.000000000 -0400
-+++ squid-2.5.STABLE1/helpers/basic_auth/SMB/Makefile.in	2002-11-07 01:37:34.000000000 -0500
-@@ -129,7 +129,7 @@
- makesnmplib = @makesnmplib@
- 
- 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 -uNr squid-2.5.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.5.STABLE1/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.5.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-07 18:36:46.000000000 -0500
-+++ squid-2.5.STABLE1/helpers/basic_auth/SMB/smb_auth.sh	2002-11-07 01:37:34.000000000 -0500
-@@ -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 -uNr squid-2.5.STABLE1.orig/icons/Makefile.in squid-2.5.STABLE1/icons/Makefile.in
---- squid-2.5.STABLE1.orig/icons/Makefile.in	2002-07-12 04:38:22.000000000 -0400
-+++ squid-2.5.STABLE1/icons/Makefile.in	2002-11-07 01:37:34.000000000 -0500
-@@ -147,7 +147,7 @@
- 		anthony-xpm.gif
- 
- 
--icondir = $(datadir)/icons
-+icondir = $(libexecdir)/icons
- icon_DATA = $(ICON1) $(ICON2)
- EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
- DISTCLEANFILES = $(ICON1) $(ICON2)
-diff -uNr squid-2.5.STABLE1.orig/src/Makefile.in squid-2.5.STABLE1/src/Makefile.in
---- squid-2.5.STABLE1.orig/src/Makefile.in	2002-07-12 11:10:04.000000000 -0400
-+++ squid-2.5.STABLE1/src/Makefile.in	2002-11-07 01:40:51.000000000 -0500
-@@ -376,18 +376,18 @@
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER = $(libexecdir)/@OPT_DNSSERVER_EXE@
--DEFAULT_LOG_PREFIX = $(localstatedir)/logs
--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_LOG_PREFIX = $(localstatedir)/log
-+DEFAULT_CACHE_LOG = $(localstatedir)/log/squid/cache.log
-+DEFAULT_ACCESS_LOG = $(localstatedir)/log/squid/access.log
-+DEFAULT_STORE_LOG = $(localstatedir)/log/squid/store.log
-+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
- DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@
- DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
- DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@
--DEFAULT_ICON_DIR = $(datadir)/icons
--DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
--DEFAULT_MIB_PATH = $(datadir)/mib.txt
-+DEFAULT_ICON_DIR = $(libexecdir)/icons
-+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
-+DEFAULT_MIB_PATH = $(libexecdir)/mib.txt
- 
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
-@@ -819,12 +819,12 @@
- uninstall-info-am:
- install-dataDATA: $(data_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
- 	@list='$(data_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \
- 	done
- 
- uninstall-dataDATA:
-diff -uNr squid-2.5.STABLE1.orig/src/cf.data.pre squid-2.5.STABLE1/src/cf.data.pre
---- squid-2.5.STABLE1.orig/src/cf.data.pre	2002-09-04 09:35:01.000000000 -0400
-+++ squid-2.5.STABLE1/src/cf.data.pre	2002-11-07 01:37:34.000000000 -0500
-@@ -156,12 +156,12 @@
- NAME: htcp_port
- IFDEF: USE_HTCP
- TYPE: ushort
--DEFAULT: 4827
-+DEFAULT: 0
- LOC: Config.Port.htcp
- DOC_START
- 	The port number where Squid sends and receives HTCP queries to
--	and from neighbor caches.  Default is 4827.  To disable use
--	"0".
-+	and from neighbor caches.  To turn it on you want to set it to
-+	4827.  By default it is set to "0" (disabled).
- DOC_END
- 
- 
-@@ -2019,6 +2019,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
-@@ -2052,6 +2054,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
-@@ -2070,6 +2075,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
-@@ -2286,7 +2294,7 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
-@@ -2296,19 +2304,19 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: squid
- LOC: Config.effectiveUser
- DOC_NONE
- 
- NAME: cache_effective_group
- TYPE: string
--DEFAULT: none
-+DEFAULT: squid
- LOC: Config.effectiveGroup
- DOC_START
- 
- 	If the cache is run as root, it will change its effective/real
--	UID/GID to the UID/GID specified below.  The default is to
--	change to UID to nobody and GID to the default group of nobody.
-+	UID/GID to the UID/GID specified below.  The default is setup
-+	to use UID squid and GID squid.
- 
- 	If Squid is not started as root, the default is to keep the
- 	current UID/GID, and only the GID can be changed to any of
-@@ -3060,7 +3068,11 @@
- 	If you wish to create your own versions of the default
- 	(English) error files, either to customize them to suit your
- 	language or company copy the template English files to another
--	directory and point this tag at them.
-+	directory where the error files are read from.
-+	/usr/lib/squid/errors contains sets of error files
-+	in different languages. The default error directory
-+	is /etc/squid/errors, which is a link to one of these
-+	error sets.
- DOC_END
- 
- NAME: minimum_retry_timeout
-@@ -3102,12 +3114,15 @@
- NAME: snmp_port
- TYPE: ushort
- LOC: Config.Port.snmp
--DEFAULT: 3401
-+DEFAULT: 0
- IFDEF: SQUID_SNMP
- DOC_START
- 	Squid can now serve statistics and status information via SNMP.
- 	By default it listens to port 3401 on the machine. If you don't
- 	wish to use SNMP, set this to "0".
-+
-+	Note: on Gentoo Linux, the default is zero - you need to
-+	set it to 3401 to enable it.
- DOC_END
- 
- NAME: snmp_access
-diff -uNr squid-2.5.STABLE1.orig/src/debug.c squid-2.5.STABLE1/src/debug.c
---- squid-2.5.STABLE1.orig/src/debug.c	2001-12-17 13:01:54.000000000 -0500
-+++ squid-2.5.STABLE1/src/debug.c	2002-11-07 01:37:34.000000000 -0500
-@@ -200,9 +200,9 @@
-     }
-     debugOpenLog(logfile);
- 
--#if HAVE_SYSLOG && defined(LOG_LOCAL4)
-+#if HAVE_SYSLOG
-     if (opt_syslog_enable)
--	openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+	openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- #endif /* HAVE_SYSLOG */
- 
- }
-diff -uNr squid-2.5.STABLE1.orig/src/defines.h squid-2.5.STABLE1/src/defines.h
---- squid-2.5.STABLE1.orig/src/defines.h	2002-08-08 16:17:39.000000000 -0400
-+++ squid-2.5.STABLE1/src/defines.h	2002-11-07 01:37:34.000000000 -0500
-@@ -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/lib/squid/errors/English"
- #endif
- 
- /* gb_type operations */
-diff -uNr squid-2.5.STABLE1.orig/src/main.c squid-2.5.STABLE1/src/main.c
---- squid-2.5.STABLE1.orig/src/main.c	2002-07-14 13:20:49.000000000 -0400
-+++ squid-2.5.STABLE1/src/main.c	2002-11-07 01:37:34.000000000 -0500
-@@ -326,6 +326,21 @@
-     asnFreeMemory();
- }
- 
-+#if USE_UNLINKD
-+static int
-+needUnlinkd(void)
-+{
-+    int i;
-+    int r = 0;
-+    for (i = 0; i < Config.cacheSwap.n_configured; i++) {
-+       if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 ||
-+           strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0)
-+          r++;
-+    }
-+    return r;
-+}
-+#endif
-+
- static void
- mainReconfigure(void)
- {
-@@ -351,6 +366,7 @@
-     redirectShutdown();
-     authenticateShutdown();
-     externalAclShutdown();
-+    unlinkdClose();
-     storeDirCloseSwapLogs();
-     errorClean();
-     enter_suid();		/* root to read config file */
-@@ -373,6 +389,9 @@
- #if USE_WCCP
-     wccpInit();
- #endif
-+#if USE_UNLINKD
-+    if (needUnlinkd()) unlinkdInit();
-+#endif
-     serverConnectionsOpen();
-     if (theOutIcpConnection >= 0) {
- 	if (!Config2.Accel.on || Config.onoff.accel_with_proxy)
-@@ -516,7 +535,7 @@
- 
-     if (!configured_once) {
- #if USE_UNLINKD
--	unlinkdInit();
-+	if (needUnlinkd()) unlinkdInit();
- #endif
- 	urlInitialize();
- 	cachemgrInit();
-@@ -853,7 +872,7 @@
-     int nullfd;
-     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());
-     else if (pid > 0)
-@@ -888,14 +907,14 @@
- 	mainStartScript(argv[0]);
- 	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);
- 	    syslog(LOG_ALERT, "execvp failed: %s", xstrerror());
- 	}
- 	/* 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);
- 	time(&start);
- 	squid_signal(SIGINT, SIG_IGN, SA_RESTART);
-diff -uNr squid-2.5.STABLE1.orig/src/url.c squid-2.5.STABLE1/src/url.c
---- squid-2.5.STABLE1.orig/src/url.c	2002-09-12 01:21:00.000000000 -0400
-+++ squid-2.5.STABLE1/src/url.c	2002-11-07 01:37:34.000000000 -0500
-@@ -314,7 +314,7 @@
-     /* remove duplicate dots */
-     while ((t = strstr(host, "..")))
- 	xmemmove(t, t + 1, strlen(t));
--    if (Config.appendDomain && !strchr(host, '.'))
-+    if (Config.appendDomain && !strchr(host, '.') && strcasecmp(host, "localhost") != 0)
- 	strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN);
-     if (port < 1 || port > 65535) {
- 	debug(23, 3) ("urlParse: Invalid port '%d'\n", port);
diff --git a/net-www/squid/files/squid-2.5.2-gentoo.diff b/net-www/squid/files/squid-2.5.2-gentoo.diff
deleted file mode 100644
index a2d5bd13dd53..000000000000
--- a/net-www/squid/files/squid-2.5.2-gentoo.diff
+++ /dev/null
@@ -1,334 +0,0 @@
-diff -uNr squid-2.5.STABLE2.orig/errors/Makefile.in squid-2.5.STABLE2/errors/Makefile.in
---- squid-2.5.STABLE2.orig/errors/Makefile.in	2003-02-11 21:02:09.000000000 -0500
-+++ squid-2.5.STABLE2/errors/Makefile.in	2003-03-28 02:08:36.000000000 -0500
-@@ -116,7 +116,7 @@
- install_sh = @install_sh@
- makesnmplib = @makesnmplib@
- 
--errordir = $(datadir)/errors
-+errordir = $(libexecdir)/errors
- 
- DEFAULT_ERROR_DIR = $(errordir)
- 
-diff -uNr squid-2.5.STABLE2.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE2/helpers/basic_auth/SMB/Makefile.in
---- squid-2.5.STABLE2.orig/helpers/basic_auth/SMB/Makefile.in	2003-02-11 21:02:25.000000000 -0500
-+++ squid-2.5.STABLE2/helpers/basic_auth/SMB/Makefile.in	2003-03-28 02:08:36.000000000 -0500
-@@ -126,7 +126,7 @@
- makesnmplib = @makesnmplib@
- 
- 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 -uNr squid-2.5.STABLE2.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.5.STABLE2/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.5.STABLE2.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-07 18:36:46.000000000 -0500
-+++ squid-2.5.STABLE2/helpers/basic_auth/SMB/smb_auth.sh	2003-03-28 02:08:36.000000000 -0500
-@@ -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 -uNr squid-2.5.STABLE2.orig/icons/Makefile.in squid-2.5.STABLE2/icons/Makefile.in
---- squid-2.5.STABLE2.orig/icons/Makefile.in	2003-02-21 16:42:41.000000000 -0500
-+++ squid-2.5.STABLE2/icons/Makefile.in	2003-03-28 02:08:36.000000000 -0500
-@@ -144,7 +144,7 @@
- 		anthony-xpm.gif
- 
- 
--icondir = $(datadir)/icons
-+icondir = $(libexecdir)/icons
- icon_DATA = $(ICON1) $(ICON2)
- EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
- DISTCLEANFILES = 
-diff -uNr squid-2.5.STABLE2.orig/src/Makefile.in squid-2.5.STABLE2/src/Makefile.in
---- squid-2.5.STABLE2.orig/src/Makefile.in	2003-02-11 21:03:14.000000000 -0500
-+++ squid-2.5.STABLE2/src/Makefile.in	2003-03-28 02:17:56.000000000 -0500
-@@ -374,18 +374,18 @@
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER = $(libexecdir)/dnsserver$(EXEEXT)
--DEFAULT_LOG_PREFIX = $(localstatedir)/logs
--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_LOG_PREFIX = $(localstatedir)/log
-+DEFAULT_CACHE_LOG = $(localstatedir)/log/squid/cache.log
-+DEFAULT_ACCESS_LOG = $(localstatedir)/log/squid/access.log
-+DEFAULT_STORE_LOG = $(localstatedir)/log/squid/store.log
-+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
- DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT)
- DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT)
- DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT)
--DEFAULT_ICON_DIR = $(datadir)/icons
--DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
--DEFAULT_MIB_PATH = $(datadir)/mib.txt
-+DEFAULT_ICON_DIR = $(libexecdir)/icons
-+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
-+DEFAULT_MIB_PATH = $(libexecdir)/mib.txt
- 
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
-@@ -836,12 +836,12 @@
- uninstall-info-am:
- install-dataDATA: $(data_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
- 	@list='$(data_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \
- 	done
- 
- uninstall-dataDATA:
-diff -uNr squid-2.5.STABLE2.orig/src/cf.data.pre squid-2.5.STABLE2/src/cf.data.pre
---- squid-2.5.STABLE2.orig/src/cf.data.pre	2003-02-05 00:27:50.000000000 -0500
-+++ squid-2.5.STABLE2/src/cf.data.pre	2003-03-28 02:08:36.000000000 -0500
-@@ -156,12 +156,12 @@
- NAME: htcp_port
- IFDEF: USE_HTCP
- TYPE: ushort
--DEFAULT: 4827
-+DEFAULT: 0
- LOC: Config.Port.htcp
- DOC_START
- 	The port number where Squid sends and receives HTCP queries to
--	and from neighbor caches.  Default is 4827.  To disable use
--	"0".
-+	and from neighbor caches.  To turn it on you want to set it to
-+	4827.  By default it is set to "0" (disabled).
- DOC_END
- 
- 
-@@ -2009,6 +2009,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
-@@ -2042,6 +2044,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
-@@ -2060,6 +2065,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
-@@ -2276,7 +2284,7 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
-@@ -2286,19 +2294,19 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: squid
- LOC: Config.effectiveUser
- DOC_NONE
- 
- NAME: cache_effective_group
- TYPE: string
--DEFAULT: none
-+DEFAULT: squid
- LOC: Config.effectiveGroup
- DOC_START
- 
- 	If the cache is run as root, it will change its effective/real
--	UID/GID to the UID/GID specified below.  The default is to
--	change to UID to nobody and GID to the default group of nobody.
-+	UID/GID to the UID/GID specified below.  The default is setup
-+	to use UID squid and GID squid.
- 
- 	If Squid is not started as root, the default is to keep the
- 	current UID/GID, and only the GID can be changed to any of
-@@ -3052,7 +3060,11 @@
- 	If you wish to create your own versions of the default
- 	(English) error files, either to customize them to suit your
- 	language or company copy the template English files to another
--	directory and point this tag at them.
-+	directory where the error files are read from.
-+	/usr/lib/squid/errors contains sets of error files
-+	in different languages. The default error directory
-+	is /etc/squid/errors, which is a link to one of these
-+	error sets.
- DOC_END
- 
- NAME: minimum_retry_timeout
-@@ -3094,12 +3106,15 @@
- NAME: snmp_port
- TYPE: ushort
- LOC: Config.Port.snmp
--DEFAULT: 3401
-+DEFAULT: 0
- IFDEF: SQUID_SNMP
- DOC_START
- 	Squid can now serve statistics and status information via SNMP.
- 	By default it listens to port 3401 on the machine. If you don't
- 	wish to use SNMP, set this to "0".
-+
-+	Note: on Gentoo Linux, the default is zero - you need to
-+	set it to 3401 to enable it.
- DOC_END
- 
- NAME: snmp_access
-diff -uNr squid-2.5.STABLE2.orig/src/debug.c squid-2.5.STABLE2/src/debug.c
---- squid-2.5.STABLE2.orig/src/debug.c	2001-12-17 13:01:54.000000000 -0500
-+++ squid-2.5.STABLE2/src/debug.c	2003-03-28 02:08:36.000000000 -0500
-@@ -200,9 +200,9 @@
-     }
-     debugOpenLog(logfile);
- 
--#if HAVE_SYSLOG && defined(LOG_LOCAL4)
-+#if HAVE_SYSLOG
-     if (opt_syslog_enable)
--	openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+	openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- #endif /* HAVE_SYSLOG */
- 
- }
-diff -uNr squid-2.5.STABLE2.orig/src/defines.h squid-2.5.STABLE2/src/defines.h
---- squid-2.5.STABLE2.orig/src/defines.h	2002-08-08 16:17:39.000000000 -0400
-+++ squid-2.5.STABLE2/src/defines.h	2003-03-28 02:08:36.000000000 -0500
-@@ -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/lib/squid/errors/English"
- #endif
- 
- /* gb_type operations */
-diff -uNr squid-2.5.STABLE2.orig/src/main.c squid-2.5.STABLE2/src/main.c
---- squid-2.5.STABLE2.orig/src/main.c	2003-01-29 17:33:49.000000000 -0500
-+++ squid-2.5.STABLE2/src/main.c	2003-03-28 02:08:36.000000000 -0500
-@@ -326,6 +326,21 @@
-     asnFreeMemory();
- }
- 
-+#if USE_UNLINKD
-+static int
-+needUnlinkd(void)
-+{
-+    int i;
-+    int r = 0;
-+    for (i = 0; i < Config.cacheSwap.n_configured; i++) {
-+       if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 ||
-+           strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0)
-+          r++;
-+    }
-+    return r;
-+}
-+#endif
-+
- static void
- mainReconfigure(void)
- {
-@@ -351,6 +366,7 @@
-     redirectShutdown();
-     authenticateShutdown();
-     externalAclShutdown();
-+    unlinkdClose();
-     storeDirCloseSwapLogs();
-     errorClean();
-     enter_suid();		/* root to read config file */
-@@ -373,6 +389,9 @@
- #if USE_WCCP
-     wccpInit();
- #endif
-+#if USE_UNLINKD
-+    if (needUnlinkd()) unlinkdInit();
-+#endif
-     serverConnectionsOpen();
-     if (theOutIcpConnection >= 0) {
- 	if (!Config2.Accel.on || Config.onoff.accel_with_proxy)
-@@ -516,7 +535,7 @@
- 
-     if (!configured_once) {
- #if USE_UNLINKD
--	unlinkdInit();
-+	if (needUnlinkd()) unlinkdInit();
- #endif
- 	urlInitialize();
- 	cachemgrInit();
-@@ -857,7 +876,7 @@
-     int nullfd;
-     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());
-     else if (pid > 0)
-@@ -892,14 +911,14 @@
- 	mainStartScript(argv[0]);
- 	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);
- 	    syslog(LOG_ALERT, "execvp failed: %s", xstrerror());
- 	}
- 	/* 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);
- 	time(&start);
- 	squid_signal(SIGINT, SIG_IGN, SA_RESTART);
-diff -uNr squid-2.5.STABLE2.orig/src/url.c squid-2.5.STABLE2/src/url.c
---- squid-2.5.STABLE2.orig/src/url.c	2003-01-18 09:16:49.000000000 -0500
-+++ squid-2.5.STABLE2/src/url.c	2003-03-28 02:34:36.000000000 -0500
-@@ -312,8 +312,8 @@
- 	return NULL;
-     }
- #endif
--    if (Config.appendDomain && !strchr(host, '.'))
--	strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN);
-+    if (Config.appendDomain && !strchr(host, '.') && strcasecmp(host, "localhost") != 0)
-+        strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN);
-     /* remove trailing dots from hostnames */
-     while ((l = strlen(host)) > 0 && host[--l] == '.')
- 	host[l] = '\0';
diff --git a/net-www/squid/squid-2.4.7.ebuild b/net-www/squid/squid-2.4.7.ebuild
index 5550bdd517b5..91135a2f42d0 100644
--- a/net-www/squid/squid-2.4.7.ebuild
+++ b/net-www/squid/squid-2.4.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.7.ebuild,v 1.6 2003/03/27 02:28:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.7.ebuild,v 1.7 2003/08/03 04:26:22 vapier Exp $
 
-IUSE="snmp pam ldap"
+IUSE="snmp pam ldap debug"
 
 # this could be cleaner..
 MY_P=${PN}-2.4.STABLE7
@@ -30,7 +30,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-debian.diff
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
-	if [ -z "$DEBUG" ]
+	if [ -z "`use debug`" ]
 	then
 		sed -i 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
 		autoconf || die
diff --git a/net-www/squid/squid-2.5.1-r1.ebuild b/net-www/squid/squid-2.5.1-r1.ebuild
deleted file mode 100644
index 51eb968f3895..000000000000
--- a/net-www/squid/squid-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.1-r1.ebuild,v 1.8 2003/07/16 17:32:54 pvdabeel Exp $
-
-IUSE="pam ldap ssl sasl snmp"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="pam? >=sys-libs/pam-0.72
-	ldap? >=net-nds/openldap-2
-	ssl? >=dev-libs/openssl-0.9.6g
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if [ -z "$DEBUGBUILD" ]
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
-	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		\
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-storeio="ufs,diskd,coss,aufs,null" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--disable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	#--enable-icmp
-	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
-	#chown root.squid ${D}/usr/lib/squid/pinger
-	#chmod 4750 ${D}/usr/lib/squid/pinger
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT COPYING \
-		CREDITS ChangeLog 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
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
-	exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
-	insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
-	exeinto /etc/cron.weekly ; doins ${FILESDIR}/squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.1-r2.ebuild b/net-www/squid/squid-2.5.1-r2.ebuild
deleted file mode 100644
index 58ec2a53daf4..000000000000
--- a/net-www/squid/squid-2.5.1-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.1-r2.ebuild,v 1.5 2003/07/16 17:32:54 pvdabeel Exp $
-
-IUSE="pam ldap ssl sasl snmp"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.72 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if [ -z "$DEBUGBUILD" ]
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	if [ `use sasl` ]; then
-		 basic_modules="SASL,${basic_modules}"
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			cd ${S}/helpers/basic_auth/SASL/
-			cp sasl_auth.c sasl_auth.c.orig
-			sed \
-				-e "s:sasl.h:sasl/sasl.h:" \
-				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
-				-e "s:strlen(password), \&errstr:strlen(password):" \
-				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
-			cd ${S}
-		fi
-	fi
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
-	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		\
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-storeio="ufs,diskd,coss,aufs,null" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--disable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	#--enable-icmp
-	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
-	#chown root.squid ${D}/usr/lib/squid/pinger
-	#chmod 4750 ${D}/usr/lib/squid/pinger
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT COPYING \
-		CREDITS ChangeLog 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
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
-	exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
-	insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
-	exeinto /etc/cron.weekly ; doins ${FILESDIR}/squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.1.ebuild b/net-www/squid/squid-2.5.1.ebuild
deleted file mode 100644
index 24720594b218..000000000000
--- a/net-www/squid/squid-2.5.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.1.ebuild,v 1.7 2003/07/16 17:32:54 pvdabeel Exp $
-
-IUSE="pam ldap ssl sasl snmp"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="pam? >=sys-libs/pam-0.72
-	ldap? >=net-nds/openldap-2
-	ssl? >=dev-libs/openssl-0.9.6g
-	sasl? =dev-libs/cyrus-sasl-1*"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-
-	if [ -z "$DEBUGBUILD" ]
-	then
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
-	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		\
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-storeio="ufs,diskd,coss,aufs,null" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--disable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	#--enable-icmp
-	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
-	#chown root.squid ${D}/usr/lib/squid/pinger
-	#chmod 4750 ${D}/usr/lib/squid/pinger
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT COPYING \
-		CREDITS ChangeLog 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
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
-	exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
-	insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.2.ebuild b/net-www/squid/squid-2.5.2.ebuild
deleted file mode 100644
index 5555b2c9443b..000000000000
--- a/net-www/squid/squid-2.5.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.2.ebuild,v 1.4 2003/07/16 17:32:54 pvdabeel Exp $
-
-IUSE="pam ldap ssl sasl snmp"
-
-#lame archive versioning scheme..
-S_PV=${PV%.*}
-S_PL=${PV##*.}
-S_PP=${PN}-${S_PV}.STABLE${S_PL}
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-
-S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-
-RDEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.72 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )"
-DEPEND="${RDEPEND} dev-lang/perl"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#do NOT just remove this patch.  yes, it's here for a reason.
-	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-
-	#hmm #10865
-	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
-
-	if [ -z "$DEBUGBUILD" ]
-	then
-		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
-		autoconf || die
-	fi
-}
-
-src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	if [ `use sasl` ]; then
-		basic_modules="SASL,${basic_modules}"
-		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			cd ${S}/helpers/basic_auth/SASL/
-			cp sasl_auth.c sasl_auth.c.orig
-			sed \
-				-e "s:sasl.h:sasl/sasl.h:" \
-				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
-				-e "s:strlen(password), \&errstr:strlen(password):" \
-				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
-			cd ${S}
-		fi
-	fi
-
-	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
-	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		\
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-storeio="ufs,diskd,coss,aufs,null" \
-		--enable-basic-auth-helpers=${basic_modules} \
-		--enable-external-acl-helpers=${ext_helpers} \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
-		--disable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-async-io \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--enable-htcp \
-		--enable-carp \
-		--enable-poll \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-		#--enable-icmp
-
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	#--enable-icmp
-	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
-	#chown root.squid ${D}/usr/lib/squid/pinger
-	#chmod 4750 ${D}/usr/lib/squid/pinger
-
-	#some clean ups
-	rm -rf ${D}/var
-	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/lib/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
-	exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
-	insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
-	exeinto /etc/cron.weekly ; doexe ${FILESDIR}/squid.cron
-}
-
-pkg_postinst() {
-	# empty dirs..
-	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
-	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
-}
diff --git a/net-www/squid/squid-2.5.3.ebuild b/net-www/squid/squid-2.5.3.ebuild
index 62b1e6b504ab..2008abd6a721 100644
--- a/net-www/squid/squid-2.5.3.ebuild
+++ b/net-www/squid/squid-2.5.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.3.ebuild,v 1.5 2003/07/16 17:32:54 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.3.ebuild,v 1.6 2003/08/03 04:26:22 vapier Exp $
 
-IUSE="pam ldap ssl sasl snmp"
+IUSE="pam ldap ssl sasl snmp debug"
 
 #lame archive versioning scheme..
 S_PV=${PV%.*}
@@ -39,7 +39,7 @@ src_unpack() {
 	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
 		Makefile.in.orig > Makefile.in
 
-	if [ -z "$DEBUGBUILD" ]
+	if [ -z "`use debug`" ]
 	then
 		cd ${S}
 		mv configure.in configure.in.orig