Add esi USE flag - bug #501898

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 28 insertions, 20 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 5e049e3d2b25..dc487731eebb 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.450 2014/03/11 20:48:29 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.451 2014/03/11 21:01:40 eras Exp $
+
+  11 Mar 2014; Eray Aslan <eras@gentoo.org> metadata.xml, squid-3.4.4.ebuild:
+  Add esi USE flag - bug #501898
 
 *squid-3.4.4 (11 Mar 2014)
 *squid-3.3.12 (11 Mar 2014)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index db672ef021b1..420d6a7a1cfa 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -33,23 +33,23 @@ EBUILD squid-3.3.8.ebuild 7922 SHA256 b6038f2c7591fe21d0a3c31f5630e1233f3de8a234
 EBUILD squid-3.3.9.ebuild 7841 SHA256 35049459d13d4af470b492718061460c73ad7707cae10e7823558d7000fcf91b SHA512 fdd03568c223b4c9eec4aabc9369b941aecbbe976e463cfd993c3867cd7f9b6bafae99dd1a5294940aa975956ce47b3a95b90c1065f067504c4e8124f9658a04 WHIRLPOOL 4cc164363a11bac592ed95dab2f6f25515575ffea5c7f0cf126926c5389390bea6c0072c94d508ed2df8bd8e0e9e283c5bda0ae2adc5b22e5ff012c02806c464
 EBUILD squid-3.4.2.ebuild 7785 SHA256 7b93d1d9e75cb82d44502e250e80cc55a10ca320e618473ad80a24f55aa52423 SHA512 4e0edf8a6e60efafb2861e87f36fabf5195ed8cea581a468ed212814dacc62690805f6bac0ac11acdff95472a04f4ee3ff7632ff8a2a4be176624bb7c1acb304 WHIRLPOOL d98c4b71c4eca09f1f9e97a86bbfa300793fabb135505ce0b4acb3748aeb08f595d3b2edd2fd2e38282acdefa46f42d772e656bcd8b9ea5d4c14d456e01de100
 EBUILD squid-3.4.3.ebuild 7910 SHA256 8862f83c6036c60dd2918e2b06f9bd324c8d331bec4de36e719f048224b38a80 SHA512 ab50e2438c0b42853d5555c7e75de00545e805a5cebb22bd03d7b3b87a5ebc693357a05ca53043c39e2242a7ab2d842cedfeefceb8558d8f7679ec62f1bab058 WHIRLPOOL b78a5bfa5c43431722fa4d63e471ee1f9685b1474de48048c41f65b9d2f83faed972dfbfd3181fcffe93e073d12008bbd9845454a5db2ae80ea5552c788f926d
-EBUILD squid-3.4.4.ebuild 7850 SHA256 a01bd7d1c31c6ce89f4570acc4255acab7aea32b12de228cd01219b47bef722a SHA512 3efb59420921b9b61d30fdb88839aca9dd2df132c4eb8389d52d9d6f026b18af296176b2ae4c3e0053e79d1127025ef1e8243aea4705770524fb648fe1a01011 WHIRLPOOL 2a451f089db02837cb33ee3062d38553609fb8e2db08f62952379cd61a252b29887d9df519bd28d98aa3c3138e272f516f35886e413a753b3269bb135700ac1f
-MISC ChangeLog 85682 SHA256 85ba50b173b17452b719d6eeb68282a44fb0841477de78cf52f43783ef3ffaf5 SHA512 5ae80c5ec8ee80991a42c654abe7d55664aa66a8d8bc8ed2427a7da364017f4deed58efe865e619f8d128ecdd664192bb3cbdb107eeccf207e39f1ff124703f6 WHIRLPOOL 5dc63620699b0a2c79e0e9904f89b22428dc85db97251d6d06ad695bcb76c660f18af665e64dfbc0b74d1792f4ab0f5b6c2d50237540f509503ce039ada682a2
-MISC metadata.xml 1568 SHA256 71cd0ce72e336467684ad8b79d42827c5dd836254d2aa58041dd2fa78f3bfee1 SHA512 6f4074db226e0882cb23d6540aec372e508cd56344985326e0cee83679d5eefc29aef69d34400af1722b23ed8c8ba306fea32c78e7daae87b969fbcf7e5a33dd WHIRLPOOL 4583018c2a3b8c93ccbdfc4ef5c9008733048cbf4a8181c9bcfdecff434c1d30df32d0027e24fdb746aae49112426b15f047fc7e44e053ea4c837c75ff48e9a3
+EBUILD squid-3.4.4.ebuild 7990 SHA256 173cb8449b7ff96edbed21aeca3e9978792d32ed8cb8a5a485cd4b21a1031e63 SHA512 c4bef1b54e2e16ef967c2fcae26e6608494372c38048f9313626927e9bab5bcfe7694a3b65ad1aa2b62e0b4caa61cfd4139215bca8f5814533329585ab2f112b WHIRLPOOL 346bc4c06c9ceceeb0c3ae4d814edb798bce792ed9167d83cde195bbb207f02d66bb3307571c41f626fa636771356cca66018ea14689c053385e7226ab92d7df
+MISC ChangeLog 85794 SHA256 5018d69bd2eb32498396e28b54a48f8895e193bb092db884c371eed82b7ca756 SHA512 ddfe3488d8deae96903b0b4e18377425c65687d62b5076f43972c6797be1b9c27f163084413636ef6a1298f3ec71e09dd8460125e16ea3d1b603972cb53ae644 WHIRLPOOL 5489a95e9796b86941e88104bc3eddbe559d0d90e3202b54263dbf5eb96fc334189c22e4c7f991273758287607d9bc515273cd3c495df91890d22ff94e5a7c8a
+MISC metadata.xml 1727 SHA256 ed46e4a4e0a120954c3d925ca17863ebbb8bef9c84287c9255a59fa69d058349 SHA512 36a201a15736be3638747489033e381593ccd9595f0c94e466a4c1c7c20bfe3d30716f657fcc0c4f884edb7f1a2b06f4f7c7bcca71c99f3b5ed69e5e9bbb73d9 WHIRLPOOL 87e107547231c7e437c1356a43da701979ea0eccc166e367032b5bae5d6c43cb3a3eb091e173d5df674185c6b88a6cdfe3e6e436ab8a2f97c7073a9f6837768e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTH3afAAoJEHfx8XVYajsfq6oP+wQc6fDgIdpjJADavWnrI6ZR
-AEi0B8XaDABqgYNPQ4k7k1jwnTNmJngXun95fhexGQ2ksWj6LtviDJnq+T6CVHOX
-Kgy81wAQ1CoFKvqun88ObBXjrGL+O03YKqoaUwNLJbge9fJMq8pXEgeVhd6waDI3
-NMVXU9QMqH9IESPOEYrW4Z2RP2y9uC9d+NOmlBMyK4rGXiaLzixBg/AhAEoaXVvX
-HYmxnpZeNbUO/zsq4RPZt6fErfV1glHHdfP2iJZ+bVLdRAycCIx7meXZc0RbKcWF
-2XxKDDk/F9F/GoyLAF0YBY+IAYD0X+EvuLCqCGJ5bHhUs4hkSMovm6hikGEdoPyt
-TP4563Ql4kkHOtK43dkVHSI/yyZEY3s+wFRic2O6LEwcjFGUpefBKlXjAMqTSkuG
-veB3NF1r2lJkNQos8iIPhZmr6B0fWibwS9GC/w29653g3jFqUYl1J9izQQmcMuO6
-g+UiiABoD19tlIaYum4MBRJZBckduuOGF8AF0iggjMhkJIk7j1jaVMXKbk8ya02/
-n0jl1/JXTLH1lfQCtgJbw2bWTr+zIEbJNgJI1iwLy5WI8yetVCvG0FCR7s02nor/
-fPPN6MLBALkuhIkeHzjbkii8CcQVGNAoO9D/7JrYSO4GysIhs41mnEKUt4zQYBSE
-pZFBVuGfNNrNr4ZCQusC
-=QMUS
+iQIcBAEBCAAGBQJTH3m1AAoJEHfx8XVYajsfoV0P/224LHiekjeThL7Ls8Fief+W
+jID2AjpVnb9XgkguvGoUHMrXEt0xTE/im1QwQSKiusoS2FXHv499Lbi0cNDhlw4Y
+XSEA54C3gUW088GaD3GitR6T88tCEKyEHdZGB8vS0JULv1gBmU+/EYaFQptyK26P
+7kqJ1Md7xKhUS+pZ5T/7WLk5yqS930PLSUS4L7ax3Zi5lWFV9Yl/r7ZOvwAGh3id
+E7x1477UPCufGH3WmcEnZDGFbt4sLTdvndBpWZlzR3YjLV2YF+i+kUGdOD6xq/HZ
+djHp2lassntSckn96kfbQxXh8TtZaBwBM/XpXqelbLkQc04vXiJQ0A0WEhBwvACj
+a8EXE9OmlW5wBCrRMxQeNUu/tlbkJBetV4hJESwOtybX4iYT+AG+fKwOt8YhY91+
+7Abg0BPpU7Yp6tQTePU+LCOiXCZoFoYcRFkXBiHQZFOhT5oJ8ZvtGhDQ7tjp7JUo
+YQKyTTHUYD6pHzF2aq8+TOT7hxlmLn2+iiPOriLm58Ooc7nqBUQRFlq6rkrbu9tE
+mbh3xnYxN0kueZ09kTp5JbVAmQx3w/teQNUjCICTKKP6XME/SEzWmenjmGYPTGAw
+eyYGAnC03qhrs6Wk3aUix+iOhG8ii2H40vQA2LnO11TF+BaIfMua138CqiKrGHf2
+eIvzVwx8nf6Oke6GIGFt
+=RMBf
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index 9c6f363de73d..b953eab7276b 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -11,6 +11,8 @@
     <flag name="epoll">Enables Linux epoll() support</flag>
     <flag name="ecap">Adds support for loadable content adaptation modules
 		(http://www.e-cap.org)</flag>
+    <flag name="esi">Enable ESI for accelerators, will cause squid reverse proxies
+		to be capable of the Edge Acceleration Specification (www.esi.org)</flag>
 	<flag name="htcp">Enable HTCP protocol</flag>
     <flag name="icap-client">Adds ICAP client support</flag>
     <flag name="ipf-transparent">Adds transparent proxy support for systems
diff --git a/net-proxy/squid/squid-3.4.4.ebuild b/net-proxy/squid/squid-3.4.4.ebuild
index 405f06d7e5f9..dd90ed88fb51 100644
--- a/net-proxy/squid/squid-3.4.4.ebuild
+++ b/net-proxy/squid/squid-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.4.ebuild,v 1.1 2014/03/11 20:48:29 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.4.ebuild,v 1.2 2014/03/11 21:01:40 eras Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap icap-client ssl-crtd \
+	ecap esi icap-client ssl-crtd \
 	mysql postgres sqlite \
 	qos tproxy \
 	+htcp +wccp +wccpv2 \
@@ -29,6 +29,7 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	ssl? ( dev-libs/openssl )
 	sasl? ( dev-libs/cyrus-sasl )
 	ecap? ( net-libs/libecap:0.2 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
 	selinux? ( sec-policy/selinux-squid )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
@@ -63,6 +64,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+	#	lib/libTrie/configure.ac || die
 	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
 		INSTALL QUICKSTART \
 		helpers/basic_auth/MSNT/README.html \
@@ -177,7 +180,6 @@ src_configure() {
 		--enable-eui \
 		--enable-icmp \
 		--enable-follow-x-forwarded-for \
-		--enable-esi \
 		--with-large-files \
 		--disable-strict-error-checking \
 		$(use_with caps libcap) \
@@ -187,6 +189,7 @@ src_configure() {
 		$(use_enable ssl-crtd) \
 		$(use_enable icap-client) \
 		$(use_enable ecap) \
+		$(use_enable esi) \
 		$(use_enable htcp) \
 		$(use_enable wccp) \
 		$(use_enable wccpv2) \