Adding support for uclibc to 2.5 Stable 6 see #61175

3 files changed, 35 insertions, 19 deletions

diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 97e11fcffd36..b5124d2d4e45 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/squid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.3 2004/08/16 11:30:58 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.4 2004/08/22 18:26:35 cyfred Exp $
+
+  23 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.6-r1.ebuild:
+  Adding support for uclibc to 2.5 Stable 6 see #61175
 
   16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.5-r3.ebuild:
   Patches introduced for 2.5.5-r3 fix the sasl sedding done in the ebuilds,
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index b071d14a1e85..8d6e788ba12e 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,22 +1,22 @@
-MD5 44a268c7eb0672c9069761b04e36c5eb ChangeLog 9435
-MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
-MD5 8777132b9dc53e9462ed51f291e9f75e squid-2.4.7.ebuild 3992
-MD5 f98ac2e961a1eaaa8437083b278a03d4 squid-2.5.5-r2.ebuild 5804
 MD5 650398264a3620304dec77a7dd0c9bc8 squid-2.5.5-r3.ebuild 5375
-MD5 979bbe7dc788f7db51f2df151ab4308f squid-2.5.6-r1.ebuild 5397
 MD5 b5d67f5d2a5b7b7e2906d18ab21eac9f squid-2.5.6.ebuild 5332
-MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
+MD5 f98ac2e961a1eaaa8437083b278a03d4 squid-2.5.5-r2.ebuild 5804
+MD5 dcc877515903d35744496ae08e917271 squid-2.5.6-r1.ebuild 5736
+MD5 8777132b9dc53e9462ed51f291e9f75e squid-2.4.7.ebuild 3992
+MD5 b3ecbfd9e2aaefba9c419266d9878c4d ChangeLog 9564
+MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
+MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
+MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
 MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71
 MD5 45bf3c4b37515fe4da4ed6d39904132d files/digest-squid-2.5.5-r3 147
-MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
 MD5 3794efc63eff1b0c9140d2396ca83e4d files/digest-squid-2.5.6-r1 147
-MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
-MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
-MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
-MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
-MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
-MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
 MD5 6e37fe3047234060fc63d5c16a4b7853 files/squid.confd 437
 MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41
+MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
+MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
+MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
 MD5 bea1d2ef8cb2f1590f89bf37f28b9268 files/squid.pam 505
 MD5 1b391c390c547ef3a249aee590e654d8 files/squid.rc6 1980
+MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
+MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
+MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
diff --git a/www-proxy/squid/squid-2.5.6-r1.ebuild b/www-proxy/squid/squid-2.5.6-r1.ebuild
index 2cb654337db4..92059a2691e4 100644
--- a/www-proxy/squid/squid-2.5.6-r1.ebuild
+++ b/www-proxy/squid/squid-2.5.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6-r1.ebuild,v 1.2 2004/08/20 02:08:13 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6-r1.ebuild,v 1.3 2004/08/22 18:26:35 cyfred Exp $
 
 inherit eutils
 
-IUSE="pam ldap ssl sasl snmp debug"
+IUSE="pam ldap ssl sasl snmp debug uclibc"
 
 #lame archive versioning scheme..
 S_PV=${PV%.*}
@@ -57,7 +57,13 @@ src_unpack() {
 }
 
 src_compile() {
-	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	# Support for uclibc #61175
+	if use uclibc; then
+		local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	else
+		local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	fi
+
 	use ldap && basic_modules="LDAP,${basic_modules}"
 	use pam && basic_modules="PAM,${basic_modules}"
 	use sasl && basic_modules="SASL,${basic_modules}"
@@ -78,6 +84,15 @@ src_compile() {
 		myconf="${myconf} --enable-underscores"
 	fi
 
+	# Support for uclibc #61175
+	if use 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
+
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/bin \
@@ -91,7 +106,6 @@ src_compile() {
 		--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" \
@@ -101,7 +115,6 @@ src_compile() {
 		--enable-cache-digests \
 		--enable-delay-pools \
 		--enable-referer-log \
-		--enable-async-io \
 		--enable-truncate \
 		--enable-arp-acl \
 		--with-pthreads \