Fix typo in USE flag and configure option: wccp2 -> wccpv2 - bug #382425

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

4 files changed, 24 insertions, 21 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index b2a411ff0135..47732ea0bd6e 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.448 2014/02/18 15:01:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.449 2014/03/11 20:41:04 eras Exp $
+
+  11 Mar 2014; Eray Aslan <eras@gentoo.org> metadata.xml, squid-3.4.3.ebuild:
+  Fix typo in USE flag and configure option: wccp2 -> wccpv2 - bug #382425
 
 *squid-3.4.3 (18 Feb 2014)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 51f98dfc4049..9604d561f567 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -29,23 +29,23 @@ EBUILD squid-3.3.11.ebuild 7841 SHA256 812bcb88b2be8f8d7aa02e1c94713897c231bd403
 EBUILD squid-3.3.8.ebuild 7922 SHA256 b6038f2c7591fe21d0a3c31f5630e1233f3de8a23445249fc29cb61579b0d90f SHA512 137b0ace09b17d9e9e779b58b50d7c90ac0bba75a551a4469c852be6d8cc7526a20c872c53301cb36e659b80ba6bd2ea4b6779b59a675b19b2d0a634984e2836 WHIRLPOOL fb75b24773892008e436b1a0261539c8b0fe9955b22f7502aa8446caf146afc9404b479fcf094e94aa8386ff2c1ac53c41ab8e5ff1806b5ebb3afe1baeb16e21
 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 7908 SHA256 10aac7204eb8e42b4c5ee70e5ea74646b561b3e5972aeb9f08eb4f5b9c73a413 SHA512 e11a4b1f4d37ffdbee6d47c02ab7bccbbdaf5d25bf88586e3566b144472d68037e8fd39b9678f593727d1f35b49f20bbb3dc9ed5fb47ca3147a31a58c170cbf7 WHIRLPOOL 1edb9c9acd49a6b775c39009def09207301d8e6b23dea78b7498dc434f192d17b9b2be5162d514da66f18188682c7b0e4cd7bb09c3216942141a0ee48bb897bc
-MISC ChangeLog 85352 SHA256 8f0df2a94628f4c8feb3b8fefd3b096a707c4752537bc2f0bba8dabd5b716400 SHA512 cbf61410ef55d6c831e4f5eb92b6f6c893e1180e1a0942ae0a5172a3b763cf899e3b45cccddd4f81da1c869eb27dd6d9e9ea4d9fc155c19ba43fe73da4e814a4 WHIRLPOOL ae527cecf585e38e935c558ccc027ae48748ef94034604bb37aeccc63e4e49186d1803d97a5245201735e6b80efc0ddaaf2101d63de15db19f7a28a3510f5193
-MISC metadata.xml 1567 SHA256 46b750d7a2d811b03d35b9747901b6516339e5f94565d25b8c218c121f7500ac SHA512 a13f6f10f3a5b1b879e187b88e47f456803609f55da948cb3892511e5808b4611038f07503b02281974c45a92bbb561532a2725c929154981e7716491759482f WHIRLPOOL d77721dfdad1ee551e2ce7a8821916357355f41173d75426c39926619c1b8a5a692535a007a1d924df82e90aeda07a202cdede99fc0a64627d670f0f38d64948
+EBUILD squid-3.4.3.ebuild 7910 SHA256 8862f83c6036c60dd2918e2b06f9bd324c8d331bec4de36e719f048224b38a80 SHA512 ab50e2438c0b42853d5555c7e75de00545e805a5cebb22bd03d7b3b87a5ebc693357a05ca53043c39e2242a7ab2d842cedfeefceb8558d8f7679ec62f1bab058 WHIRLPOOL b78a5bfa5c43431722fa4d63e471ee1f9685b1474de48048c41f65b9d2f83faed972dfbfd3181fcffe93e073d12008bbd9845454a5db2ae80ea5552c788f926d
+MISC ChangeLog 85506 SHA256 42e66695c4c0f1001cf65e2c8be39fea4fa8b6e262e058de4bd206b077e34c88 SHA512 76908e4360d2f803aaa985c93f4d67eb2dba71619bd63ded4d6990db46e74992429fec1720c72071b5d522a9d3d907a503690403afd788f06fe962ff44fab3ad WHIRLPOOL 2760747eec0c0447915ac9abda6ab3e40911f819e553120fe5a0de0ca51f9536a94de027cbb4f4129d63106b3ea0529c50f6de5a310523c778fbf74e669f41f5
+MISC metadata.xml 1568 SHA256 71cd0ce72e336467684ad8b79d42827c5dd836254d2aa58041dd2fa78f3bfee1 SHA512 6f4074db226e0882cb23d6540aec372e508cd56344985326e0cee83679d5eefc29aef69d34400af1722b23ed8c8ba306fea32c78e7daae87b969fbcf7e5a33dd WHIRLPOOL 4583018c2a3b8c93ccbdfc4ef5c9008733048cbf4a8181c9bcfdecff434c1d30df32d0027e24fdb746aae49112426b15f047fc7e44e053ea4c837c75ff48e9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTA3VqAAoJEHfx8XVYajsf3zgP/jswgasWxaTyzb4YSer10uB6
-X+TSVewGbX4UHLDKMsi2mZp3lOyndd824ghka2H4JDbDW5V4XZZLa1UNRr5Sl2D7
-msuLCrfcFjVmw1yXrQReWc9JpDUfIFL4v8t9GNkhbIfqq0T9DIZV/ZmpD+MxD2Gj
-7b8a+HO9LL1EK5LHKewNbu0ehY9Vt3j4j7WIxj9GtANhMgnUo9tTZgOQ+nM0fAeJ
-BhYpfkWQgtzGKjEcEGEwKOJZXco/Gau4hRTiU6Wa5RhX2QOCSXrB0uQcq10bjP6K
-P5ENbuydbcbZPrQe00ZR/Ti9ZL7T7FuVMtd9ZmjWCF8YMsx4H/y9VuY26O2aPwPX
-iEyNng0NLDL5ilzfuGHJ4teUU44sAuFt7fp6XyH537NoGTWtIJQibBO+IcNU/5Z6
-MnIU42rJY27xLvUfOfdUKYmXKC42HmX3A/k8ophRHcOqoOwxlxJZTXbjIcTuxbgr
-2oLTQK39+xC9ayVWGOcv1aA81p8x7ycseSvq5SUZwoA0l6Ti5FToANGaeYUwp+lb
-PfBooqdLXbYKzst8lNW+hZp4QAmWucXqtdAo8JITXaHUUS9VgZLrE2jd7ayfzEu2
-Gedm9y3EwOPnByTYgoKnRQQ7F0ShNYZAQeDkP59GaCgnzgqa0VzhfgpxfABgk+Gs
-bME7foHEI0fnnQcI+PS+
-=ry79
+iQIcBAEBCAAGBQJTH3TtAAoJEHfx8XVYajsf3fkP/31I2p3MJsH0uY0w7xMKJ1nJ
+CHpTYEvDxEsWJKm9xzYXfphF8J+dOfPzinMWLDmhdMlQkbQnEdFCzLTZ2k7kYQbK
+i4RiwVjkBuA/nEckn1fRvUF18aLDjn7ao6jRnjr4xdkrUhyAPf1G4+oG9vt/+75t
+cBmJvyK+UpmrCpQyn+BKtoigOeuiXLRYEXZk+mCMR+r6DEcLPKz41J5o37PVHUJa
+Lo2l4MnM/nq1A7ItN6k06jgw7gN7PJt9+5ggBkZprtPKAsGaPE9Axq2eYSggwIEX
+Y8bt2cSfBPGf+bMebc8vefXKi90EwboVeuy85nGYgCRztvAEFK8vDcfMlf7eeIym
+AHlc9Cp49pL7FxVPQq09b1iCqe8eE0C4I9HjNy75vUYe8jLl1Uaj2Ao+5fdL8f6M
+Nsfd96F7r73nv3Cnd2IcMvlmSWL7ZeS1BsvPe4h//o7Qdqwv3qWKgMnfWU9/rZB9
+f7188tBaVebfNkgHCpR6LogHdXpdzFRmQnxSK8/2R5JfxHig7n8zi1kCRAlJUCAs
+UWlwqjF35rFSsdJOnQdSGaPvDLQf2cz5ufD6tSS7XMA2Q9JIOP/cTPC0L6iAm5dn
+yUa3MSaWP+S8RomCdA5oBR46LIi5NilV/9BZHVzJnS1MDKJW05nzpYGHq3+KqzZH
+LZQrCncC8ZDsF1+Sw9D6
+=pin6
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index 4f40ef311023..9c6f363de73d 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -27,7 +27,7 @@
     <flag name="tproxy">Enables real Transparent Proxy support for Linux Netfilter
 		TPROXY</flag>
 	<flag name="wccp">Enable Web Cache Coordination Protocol</flag>
-	<flag name="wccp2">Enable Web Cache Coordination V2 Protocol</flag>
+	<flag name="wccpv2">Enable Web Cache Coordination V2 Protocol</flag>
     <flag name="zero-penalty-hit">Add Zero Penalty Hit patch
 		(http://zph.bratcheda.org)</flag>
   </use>
diff --git a/net-proxy/squid/squid-3.4.3.ebuild b/net-proxy/squid/squid-3.4.3.ebuild
index 4082826aab03..45d954e13065 100644
--- a/net-proxy/squid/squid-3.4.3.ebuild
+++ b/net-proxy/squid/squid-3.4.3.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.3.ebuild,v 1.1 2014/02/18 15:01:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.3.ebuild,v 1.2 2014/03/11 20:41:04 eras Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrota
 	ecap icap-client ssl-crtd \
 	mysql postgres sqlite \
 	qos tproxy \
-	+htcp +wccp +wccp2 \
+	+htcp +wccp +wccpv2 \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux"
 
@@ -190,7 +190,7 @@ src_configure() {
 		$(use_enable ecap) \
 		$(use_enable htcp) \
 		$(use_enable wccp) \
-		$(use_enable wccp2) \
+		$(use_enable wccpv2) \
 		${transparent}
 }