Set SQUID_MAXFD through configure params instead seding autoconf.h (#199202).

Package-Manager: portage-2.1.3.16

4 files changed, 24 insertions, 24 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e753be2c9823..ff7d3602bf81 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
 # 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.164 2007/11/04 08:22:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.165 2007/11/15 08:37:42 mrness Exp $
+
+  15 Nov 2007; Alin Năstac <mrness@gentoo.org> squid-2.6.16.ebuild,
+  squid-3.0_rc1.ebuild:
+  Set SQUID_MAXFD through configure params instead seding autoconf.h (#199202).
 
   04 Nov 2007; Alin Năstac <mrness@gentoo.org> squid-2.6.16.ebuild,
   squid-3.0_rc1.ebuild:
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 1c0537eb32a3..1392f3f62310 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -43,18 +43,18 @@ RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 files/squid.pam 315
 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f files/squid.pam 315
 DIST squid-2.6.STABLE16.tar.gz 1710035 RMD160 a6a1de36baf28c36916e09a713ca30d33a10054a SHA1 6e56df7270512f9676b20a4d9e5a96f675aa0d23 SHA256 0326bd0bb36d9f19349b5e103f94f675bd4ead225766645035b7bec7452fe72f
 DIST squid-3.0.RC1.tar.gz 2405744 RMD160 5a38b65b12d8cfc5d78d9fdc3073712e0712218d SHA1 892249df0bee9b3718334fcd53f17bd1e92fd9a4 SHA256 64a5ffa15be9cf5d1563851be2b248dd20c90678d161bc144f5bfb7d859daab6
-EBUILD squid-2.6.16.ebuild 5799 RMD160 939b47a2cbd1db653d9d835a5d8582cbd8caa115 SHA1 0fcec3ddb1fd2e882ffcaca7585157f443b39106 SHA256 651668afd2154969b346a4f98f440adf4575b5bccbbff9f87ce10659dc2e9255
-MD5 311b4850336d59e8acc294ee7878bb78 squid-2.6.16.ebuild 5799
-RMD160 939b47a2cbd1db653d9d835a5d8582cbd8caa115 squid-2.6.16.ebuild 5799
-SHA256 651668afd2154969b346a4f98f440adf4575b5bccbbff9f87ce10659dc2e9255 squid-2.6.16.ebuild 5799
-EBUILD squid-3.0_rc1.ebuild 5644 RMD160 e8d54879298a3829fe668a499507927db5c0e330 SHA1 db106a77029535fa6c82383d15bb7356951c615b SHA256 b9915e98b598bad97d51fbc71cb6dec97a6eda346045b3bd2d064e81e28ac6be
-MD5 28ac0fc458a4c1fdaa8b31e9a911f3bc squid-3.0_rc1.ebuild 5644
-RMD160 e8d54879298a3829fe668a499507927db5c0e330 squid-3.0_rc1.ebuild 5644
-SHA256 b9915e98b598bad97d51fbc71cb6dec97a6eda346045b3bd2d064e81e28ac6be squid-3.0_rc1.ebuild 5644
-MISC ChangeLog 38749 RMD160 ea6bb175eb70771713aa97cf56fb1fe6b7de3c45 SHA1 8861b13a0a4d9885be0dbafbc9dd66404f686d96 SHA256 2934f6f57405695d7e795b9af5cdc7862e7d4593694ca5e5db6fe288a3403b66
-MD5 af30b72430780d8d58a44bc7b6b98bca ChangeLog 38749
-RMD160 ea6bb175eb70771713aa97cf56fb1fe6b7de3c45 ChangeLog 38749
-SHA256 2934f6f57405695d7e795b9af5cdc7862e7d4593694ca5e5db6fe288a3403b66 ChangeLog 38749
+EBUILD squid-2.6.16.ebuild 5733 RMD160 4eeb27b3d7ad70f50452f51921ae28b49659ac90 SHA1 b13c149d7c52385dcaec46072efa2693bcc4ae5c SHA256 4888dcf38c0f8776d5eff398321d1abf1fde15ab8574486534969649dacdae7b
+MD5 d56d9d425bfd549e1d067dc8c3dfdc19 squid-2.6.16.ebuild 5733
+RMD160 4eeb27b3d7ad70f50452f51921ae28b49659ac90 squid-2.6.16.ebuild 5733
+SHA256 4888dcf38c0f8776d5eff398321d1abf1fde15ab8574486534969649dacdae7b squid-2.6.16.ebuild 5733
+EBUILD squid-3.0_rc1.ebuild 5588 RMD160 f100ea9045fcd0793c15a82cf082b5372749d957 SHA1 e5f92d4baf312c016748158c49d09cffbed55201 SHA256 48e535ba3f375ac65e674cd85fdced2f76efeaaa2ba8b1fb9256c8ea41879623
+MD5 4f7808adb00280c7a5fca3c71bc40d5b squid-3.0_rc1.ebuild 5588
+RMD160 f100ea9045fcd0793c15a82cf082b5372749d957 squid-3.0_rc1.ebuild 5588
+SHA256 48e535ba3f375ac65e674cd85fdced2f76efeaaa2ba8b1fb9256c8ea41879623 squid-3.0_rc1.ebuild 5588
+MISC ChangeLog 38923 RMD160 43f7a19f5d1ba9edee6ab38d1e20ef3531c50585 SHA1 f8829fbc41989d2cdcc58f203db52ce1d7dfb33b SHA256 753bef1f94bea1ea8f0f4e6a498f1cbf2dabe1215c718f228ea5907bcfa9ac67
+MD5 a4499a4a501c7c84b6999aecccda4243 ChangeLog 38923
+RMD160 43f7a19f5d1ba9edee6ab38d1e20ef3531c50585 ChangeLog 38923
+SHA256 753bef1f94bea1ea8f0f4e6a498f1cbf2dabe1215c718f228ea5907bcfa9ac67 ChangeLog 38923
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -68,7 +68,7 @@ SHA256 274ca3f42decf16499319e6d8f6b0b76e976e7b819fa6c54c909b84ea469366b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHLYFTVSA5X31g7/gRAuTcAJwNVL5aeiwHUgoGBloGowpZNnF7/QCeJj3a
-AYJS+gH5tET+Yqy3Lv2Oz0Q=
-=EVOK
+iD8DBQFHPAVhVSA5X31g7/gRAs3EAJ9xcwmxbeiSmrtse7lz+7qamhWqmwCfeprG
+NvTy2QHCknfUVY9qq+3z/w4=
+=n75b
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-2.6.16.ebuild b/net-proxy/squid/squid-2.6.16.ebuild
index 5a0062171125..2aedb5d106eb 100644
--- a/net-proxy/squid/squid-2.6.16.ebuild
+++ b/net-proxy/squid/squid-2.6.16.ebuild
@@ -1,6 +1,6 @@
 # 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-2.6.16.ebuild,v 1.11 2007/11/04 08:22:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.16.ebuild,v 1.12 2007/11/15 08:37:42 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -124,13 +124,11 @@ src_compile() {
 		--enable-htcp \
 		--enable-carp \
 		--enable-follow-x-forwarded-for \
+		--with-maxfd=8192 \
 		$(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"
 }
 
diff --git a/net-proxy/squid/squid-3.0_rc1.ebuild b/net-proxy/squid/squid-3.0_rc1.ebuild
index 74f605bb69dc..612a37c4a511 100644
--- a/net-proxy/squid/squid-3.0_rc1.ebuild
+++ b/net-proxy/squid/squid-3.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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_rc1.ebuild,v 1.3 2007/11/04 08:22:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0_rc1.ebuild,v 1.4 2007/11/15 08:37:42 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -116,14 +116,12 @@ src_compile() {
 		--enable-referer-log \
 		--enable-arp-acl \
 		--with-large-files \
+		--with-filedescriptors=8192 \
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		$(use_enable icap-client) \
 		${myconf} || die "econf failed"
 
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
 	emake || die "emake failed"
 }