add customlog flag (#85740)

(Portage version: 2.0.51.19)

5 files changed, 19 insertions, 17 deletions

diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 8f9b8bbb98a6..d9cdae8f1abf 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-proxy/squid
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.50 2005/03/14 02:39:50 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.51 2005/03/28 14:02:39 mrness Exp $
+
+*squid-2.5.9-r2 (28 Mar 2005)
+
+  28 Mar 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.9-r1.ebuild,
+  +squid-2.5.9-r2.ebuild:
+  Add customlog local USE flag which decides whether or not customlog patch is
+  applied (#85740).
 
   13 Mar 2005; Hardave Riar <hardave@gentoo.org> squid-2.5.9.ebuild:
   Stable on mips, bug #83955.
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index e0ccb3595d23..8994f0022aa9 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,14 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3a2538e403f25c33ed40b387976acfb9 squid-2.5.8-r1.ebuild 6107
 MD5 b9ff38560b3015ac8e39b3630ec9495f squid-2.5.9.ebuild 6021
+MD5 b9031e08d2c1b2db27be526b9c063aac squid-2.5.9-r2.ebuild 5898
 MD5 f2881ab9b7a08ed59e6f62d772193dfb squid-2.5.8.ebuild 5893
 MD5 f169a3b97092bae74b4df7da5b89debd squid-2.5.9-r1.ebuild 5835
 MD5 0bed12a824330391fc636d75dee99ec4 ChangeLog 15779
 MD5 c0fd2ab16f04e5c691ca42cb5585071a metadata.xml 330
 MD5 c2d230465ceefe887175cb8121d0fbc8 files/digest-squid-2.5.8-r1 156
 MD5 2d54bc729a5feaa7c217dbe8a8a480b9 files/digest-squid-2.5.9-r1 156
+MD5 6d21b96f78c499cddf9ec02462a954cc files/digest-squid-2.5.9-r2 156
 MD5 e4e44e57aa7d93849649c3ceb67a3a65 files/squid.confd 437
 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
 MD5 c3048f19a1c725e2c53f86640b752382 files/squid-2.5.8-gentoo.diff 17233
@@ -18,10 +17,3 @@ MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid-logrotate 101
 MD5 89952d7cb51de1e4dbe9b5a1992aaf13 files/squid-2.5.9-gentoo.diff 17411
 MD5 b1028824f46381ebe326b5faf0e06d35 files/digest-squid-2.5.8 155
 MD5 7aec9f6b933e46cb25a72c56c0993e9e files/digest-squid-2.5.9 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNPjyM+I1L6GK/u4RAgDmAJ0Q7Yg7J+rv0/c13Xt/3MuLK0IGFQCdFxlo
-0f4VT0b92VqmclEAePraLQU=
-=hLry
------END PGP SIGNATURE-----
diff --git a/www-proxy/squid/files/digest-squid-2.5.9-r1 b/www-proxy/squid/files/digest-squid-2.5.9-r1
deleted file mode 100644
index 9d1f469c5c15..000000000000
--- a/www-proxy/squid/files/digest-squid-2.5.9-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5a34a303dcab8851c7ab20e24af69b61 squid-2.5.STABLE9.tar.bz2 1057776
-MD5 d89526b42e516515117753190a9f23dd squid-2.5.STABLE9-patches-20050304.tar.gz 20526
diff --git a/www-proxy/squid/files/digest-squid-2.5.9-r2 b/www-proxy/squid/files/digest-squid-2.5.9-r2
new file mode 100644
index 000000000000..ed97fc9dc251
--- /dev/null
+++ b/www-proxy/squid/files/digest-squid-2.5.9-r2
@@ -0,0 +1,2 @@
+MD5 5a34a303dcab8851c7ab20e24af69b61 squid-2.5.STABLE9.tar.bz2 1057776
+MD5 772ff24e5c688207907ac419817f74da squid-2.5.STABLE9-patches-20050326.tar.gz 81209
diff --git a/www-proxy/squid/squid-2.5.9-r1.ebuild b/www-proxy/squid/squid-2.5.9-r2.ebuild
index 381a420e69cc..6059f397ab3f 100644
--- a/www-proxy/squid/squid-2.5.9-r1.ebuild
+++ b/www-proxy/squid/squid-2.5.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.9-r1.ebuild,v 1.1 2005/03/06 20:52:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.9-r2.ebuild,v 1.1 2005/03/28 14:02:39 mrness Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ inherit eutils toolchain-funcs
 S_PV=${PV%.*}
 S_PL=${PV##*.}
 S_PP=${PN}-${S_PV}.STABLE${S_PL}
-PATCH_VERSION="20050304"
+PATCH_VERSION="20050326"
 
 DESCRIPTION="A caching web proxy, with advanced features"
 HOMEPAGE="http://www.squid-cache.org/"
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores logrotate"
+IUSE="pam ldap ssl sasl snmp debug uclibc selinux underscores logrotate customlog"
 
 RDEPEND="virtual/libc
 	pam? ( >=sys-libs/pam-0.75 )
@@ -36,7 +36,9 @@ src_unpack() {
 	cd ${S} || die "dir ${S} not found"
 
 	# Do bulk patching from squids bug fix list as well as our patches
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
+	useq customlog || rm ${WORKDIR}/patch/9*customlog*
+	EPATCH_SUFFIX="patch"
+	epatch ${WORKDIR}/patch
 
 	#hmm #10865
 	cd helpers/external_acl/ldap_group
@@ -117,6 +119,7 @@ src_compile() {
 		--enable-truncate \
 		--enable-arp-acl \
 		--with-pthreads \
+		--with-large-files \
 		--enable-htcp \
 		--enable-carp \
 		--enable-poll \