Replaced deprecated opts variable in init script (bug #385641)

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

3 files changed, 25 insertions, 21 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index d70899aa9dd3..7c3f31dff674 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.327 2011/10/17 19:18:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.328 2011/10/23 18:45:39 polynomial-c Exp $
+
+  23 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> files/squid.initd:
+  non-maintainer commit: Replaced deprecated opts variable in init script (bug
+  #385641).
 
   17 Oct 2011; Eray Aslan <eras@gentoo.org> -squid-3.1.8.ebuild,
   -files/squid-3.1.8-gentoo.patch, -files/squid-3.1.8-libmd5.patch,
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f68fba690440..61f0b5795418 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX squid-2-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
 AUX squid-2.7.9-gentoo.patch 13118 RMD160 44d2482b9c998c1641ab3e2d5c5701a4f6fb6165 SHA1 b5007d3d2df28c35b88c814b41fd4e182ad34f2b SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11
 AUX squid-3.1.15-gentoo.patch 10538 RMD160 f4ac679e89bdd8d43a2cd00b1a63d555a25b9528 SHA1 63b2c8a1767019b35b75403dd9a7bf6b33c69edc SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3
 AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
-AUX squid.initd 3315 RMD160 a6209a27770eb2aebdd533c946e790efec0de53b SHA1 08519fa20a7286cba9ea82e7b23dd8116ab7f77b SHA256 d3eac36c2fc313688e19cde7ace63783cd202315b23c0b2bd0219a4504cb2b35
+AUX squid.initd 3331 RMD160 90579b249baaf727fad9f6ceaaf8b2a1e5f1e97f SHA1 0b6f4e10d758619101f0ea56b5146dc268b8b3e0 SHA256 7a81926479941054358bce650c8c9d3f070a7b40c886e5ed3a337668997bc0ab
 AUX squid.initd-logrotate 3163 RMD160 b7d58517e4198ceb7416c00004c91ac30a241bfb SHA1 714d51e0c449817c12e7230942f89c1a62012107 SHA256 b403b7ffebc08c2ce76cd2b8b6c53a639f24e3e35933ba9766aa4623a34a1279
 AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
@@ -14,22 +14,22 @@ DIST squid-2.7.STABLE9.tar.gz 1789462 RMD160 59c63348beed9a672612d48f9ef5e7ca81f
 DIST squid-3.1.15.tar.gz 3397495 RMD160 cf5910e15ed594cde5f205206d4c1ec65aa445f3 SHA1 c0cfdf54db5ca6ffc23c3f328175ec19f6465d8c SHA256 c56207691ec6ce19f7d19805b290b8f58c63c81e2070d7cd3a824a0b49509b2b
 EBUILD squid-2.7.9.ebuild 6175 RMD160 a235925ac773d7d569a958366923e5a03adcc17c SHA1 0dbb84b76302c265ef4ee193035f5882d46146ed SHA256 587b0f52d2fb973f2686d947893191acf3a1770d467cd8134091fa2c07f01f3d
 EBUILD squid-3.1.15.ebuild 6621 RMD160 c959b10a7905e000bcf49ea296cbb191555ddfa0 SHA1 dde6be2583ce96050a23f964ae1bed8b58170b5b SHA256 911d065d38544a59af7ce6f4299fc282fdf10aa4bd0869503b45b214fdf87bbc
-MISC ChangeLog 69801 RMD160 837b2089a7ca13669ddf0c57ebf4331adc72545c SHA1 47b7c87f729fc65291b9ac092aac361951a8eb1c SHA256 53cc831caa2d3eb02064e92a2b9223606110f6fb9469cbf0864ba6dcf16823ea
+MISC ChangeLog 69974 RMD160 7259f59ecd331f26e9dc9834f726a0cfd26ebe60 SHA1 96a013dda26184661d83d309e775e35f5a9e75ff SHA256 257f051332c0ba5563103ee6d76b0e935862867dac362d03398a670ad7f7bb79
 MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOnH+ZAAoJEHfx8XVYajsfHC0P/A5O2lU8/MSYF2X80rD1IjPd
-+y4yZV5XlRZibUK4u2/zJYfKSc/XD33d4wsSGiFvnLEDgTbZnvolx/F9nxNg81ua
-aLy4dAk7m5gqTp+buHMlqEP5pZWU243mTBcor33zg4XTlGt012eOJj/JGCBVSlXT
-f4EP0X5B+lpEvLO3H9biZVZaQXVs9lQCvaxcpWAPnoVWmhmUgFYS2fcqU1KWx4nE
-iv5fFdderLCy0Q7t7fR1sbl3LbUSH85p3vj/KJiYnSnH+Yh9A40jF5PCw4mN2dhK
-OWEr7MND1f1tCJRyf8N7a+NE1IDHOt+AG56O3Uy1d3MLdL+NqoLXXm8ZAGR2BOS6
-ux8Hvrp3+MIZBbHHWjOhecJgUKsAODmMphlX6Z+L8keQsZZ/sr+DgwkaQRvpmq0o
-1DSQaawG1z/uu+bexZZ6Bn6Vb6N3+oQ5R+WFPOnuPlWdMD808SlYdNd5FltBL35/
-BQeLk+THf5jOB+IA2TZ74nt0YuZhICulRyzP4wiG8sVKgk6HrkaGu7tMwhsebFb9
-LGahXa2ADhY77yaClqMtpGRcsPzV/DT2v/d32x3cSaSUlxYhHgFeJ8Q/w1LcGSJQ
-R5paGd/jIjYGTOtynZZlX4wxbW5DoAnE0/3t2fPiy0HaQgxSmCnCoUT3hRLLTT09
-qkRFl38CwhBaEtrgmWVc
-=4VLv
+iQIcBAEBCgAGBQJOpGDYAAoJEPiazRVxLXTFtIEQAL6qrJ4TnuYu7D9ZeKDIFhDQ
+c8TU6NhPC6qulURKXmvOH6banmKIlf14OthmFCimINzjT9ioSw8upQulk8Rg7eAQ
+GvtnKuJNubHhFrCDMRkKbEjNKipSx0xhV06HBFM6mWUYfsbCosrGywRVeJE4FMjT
+iwAD2GVuluzt1LqxNEaQ1tAdrQo9YW+kFkptoknJJtaMeMqnnaXMaT6fbejg2XdJ
+LfOVoN+GsOB67SpMViMDqPrjEKVfLGyEx7qe+KALSm53ghTfVgt0aF+ez3/lx3gT
+9LP5130ZcHhx06a9z4vEYh/1Gt0L63L3RSogXWw1CoN+Hu5Lhni1uqAyWYsqoJY4
+CoMzcrOXRbl5luGB8hQttn6wANhI2PZPOEak5s7wglQJoJlambgrIrd+r4yR0b4X
+ExUW42NQXAtaC5AYAJcHpE1hBEK6lDyc4B2WRSUEp1cPs0dgwIl0LKfpNtgK6nBJ
+RPbBkp73yRAHxUdrNCNTaXgWUf7sIrpES83rvK9cHUMXz2A0WRygi2YmKB52LVjS
+KNdSbUHEswVWUVvpm7u5YJMrYg2MASTUTphlF5tMHSh36Fg1szKd0ZjWfRF5vhh+
+QNo6pZdth71i9Afmv8HY6o5H6aMk7kx5tMVE30A5MqkIrG88/fpnU5N8slqGHynG
+sR3DZ3qYLvESEfHlf1GW
+=+qiN
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index cc145bd55e64..78589b07dcc9 100644
--- a/net-proxy/squid/files/squid.initd
+++ b/net-proxy/squid/files/squid.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.13 2009/11/28 12:32:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $
 
-opts="${opts} reload rotate"
+extra_started_commands="reload rotate"
 
 depend() {
 	use dns