Revbump. Don't use the deprecated $opts variable, bug 386767.

Package-Manager: portage-2.1.10.41/cvs/Linux i686
RepoMan-Options: --force

7 files changed, 32 insertions, 19 deletions

diff --git a/net-misc/htbinit/ChangeLog b/net-misc/htbinit/ChangeLog
index 2f7e732c6f93..c93721ce4ac0 100644
--- a/net-misc/htbinit/ChangeLog
+++ b/net-misc/htbinit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/htbinit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v 1.15 2011/11/16 00:18:15 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v 1.16 2012/01/01 00:56:46 idl0r Exp $
+
+*htbinit-0.8.5-r5 (01 Jan 2012)
+*htbinit-0.8.5-r4 (01 Jan 2012)
+*htbinit-0.8.5-r3 (01 Jan 2012)
+
+  01 Jan 2012; Christian Ruppert <idl0r@gentoo.org> -htbinit-0.8.5.ebuild,
+  -htbinit-0.8.5-r1.ebuild, -htbinit-0.8.5-r2.ebuild, +htbinit-0.8.5-r3.ebuild,
+  +htbinit-0.8.5-r4.ebuild, +htbinit-0.8.5-r5.ebuild, files/htbinit.rc,
+  files/rc_htbinit:
+  Revbump. Don't use the deprecated $opts variable, bug 386767.
 
   16 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> htbinit-0.8.5-r1.ebuild,
   htbinit-0.8.5-r2.ebuild:
diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest
index 3a7d4796502c..d2815743b19e 100644
--- a/net-misc/htbinit/Manifest
+++ b/net-misc/htbinit/Manifest
@@ -3,13 +3,13 @@ AUX htb.init_find_fix.patch 1165 RMD160 701827b114f6d5235254a2dc0fd5dbaf9bdd7f00
 AUX htb.sysconfig 7137 RMD160 9a210c11c57adc8ebffa5db6b1dbe561020d63c8 SHA1 3c91415cb2b3867e8e18ad55ce836b88f5ee362c SHA256 69cfa9cb9818da69ac61808fdf0933eef911f6bd58494e3514142c6061e7cc6f
 AUX htb_0.8.5_esfq.diff 1844 RMD160 86a855938fe26d49f2362fea7adab720ba58893c SHA1 006d912ddb61ef9cf2471b41abcf04b51a0003ce SHA256 d4f5b79d64eb008e799e03b509fbfe3153b7722c0575423d2797dc95b87b7f90
 AUX htb_0.8.5_ipv6.diff 4663 RMD160 61fc271c0519b6ad83aaf01abbc457f175e2f58f SHA1 642a15c9e8b48b134d83fa5033b8b1e611a945c7 SHA256 34e59cfa5fa06694ceb3c2368e49376bd61ec968bd3ee9cbd8ab753353e4c339
-AUX htbinit.rc 791 RMD160 dbc58c7acb5edcc0c3be4239c4848984d05e625e SHA1 16d380cd7df2a9704b56c64cc9de50e9c6cb37b8 SHA256 5864f79634daeb45d0b4bd53a114037eab2ec1e22414c098beb4a088e3092654
+AUX htbinit.rc 812 RMD160 9e47a31f4d456b9751b45a31a4bd60d8c347c9c6 SHA1 9369448d17430218752a6a17c875c07cc943920e SHA256 7181a1bd94d2e110d18dc9e4ba972ecc86528efece7296c299e6045f32090ff1
 AUX prio_rule.patch 636 RMD160 7ddb72d87155f43ed2c2af1a2cbbfdf0c643156c SHA1 182bd63d25cf2d9dc8e740487b94b1a6b9bd2bf2 SHA256 9c922957a37ecba93555ab1cac8684b3ef340b9da8e039394738e627ef24171a
-AUX rc_htbinit 1079 RMD160 2f84fcba33d36efd3733e30c04f734e250e3827b SHA1 f29b214a494cf12fffa88b5ede1be55189ec61d8 SHA256 ea58fe4fd99adf3fc3eee3db5e3663e3e8abcc25b44ccc96c2d839ad54cfb524
+AUX rc_htbinit 1108 RMD160 c7b1386546b98b2c4ae5e475778a404bf8578a53 SHA1 c90481dd2f1ba62fc35dac099bebfeef8b7e1946 SHA256 c83e1f1272def733b480423d2ebba4bc1d89a607c7627474bb7bca81573b6d06
 AUX timecheck_fix.patch 1221 RMD160 2099a1513edb0662c4389d86ce9cc45031d548e8 SHA1 ae33b259bd1e6afadcc0e2a062b751a5358b78d1 SHA256 af5579df10eb67a37f6a9d9b042d2347e483cff4b89b47c76cc9c17b2f68d68a
 DIST htb.init-v0.8.5 32038 RMD160 46a7f4c3e606828b3e26c29a2a0e87cef63d85b2 SHA1 edb7833188083a582bba11c5299d2dbccbecdcb8 SHA256 acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586
-EBUILD htbinit-0.8.5-r1.ebuild 1695 RMD160 4be3244f99d1bf796ee9a55de26bab292bbcf3c1 SHA1 9db959ce70e8ff3cd7a116d4fdb4ea4737daa2f8 SHA256 9631c44bc523866a006376d845579309a40d0e687de1efe7793ca1871b08f427
-EBUILD htbinit-0.8.5-r2.ebuild 1726 RMD160 eb2148cb429ce0aa698b3ed5e015fad90ee345aa SHA1 820624bf615ed556f21cd2ace1278d469a4ab9b7 SHA256 0b3a0c3a889d05ce3e522d2ea00cfee77712574fcca9e29e3f6a153a363dba0e
-EBUILD htbinit-0.8.5.ebuild 1347 RMD160 4081ac8e80e957b5a737ef7fddc2bb426492c32f SHA1 54f24e759ba62aa7c7cc710a410a86a694a0866d SHA256 9e8b8f4cd6596e972c8cc264d8cf7e14364faeaa75fcd9ab59bdbb889a2d1fb1
-MISC ChangeLog 2467 RMD160 dca949b7716f1249cf631d754181eb10c633922e SHA1 126cdc4c3b326da92b3eb265774fdbe3197b0762 SHA256 aac3a9d5491e346d8a895b34b793d195d8f62ab4b32a22a3d0a91a748fa82fc3
+EBUILD htbinit-0.8.5-r3.ebuild 1346 RMD160 832de0cd8f594eff2d91e1a95b4c7df7987de1f2 SHA1 eabe9bb1bb775fcfe8565116af5b9616ef783621 SHA256 06d0d6a696d35fb636845d1d874bc89392f9af855683b72fc7629f1197d52e70
+EBUILD htbinit-0.8.5-r4.ebuild 1693 RMD160 f9890da11cedb8b4f107344dd3d889f46b9cdc05 SHA1 16bf11f281376c3af90bf9b7e9d64ab2ffc89cb4 SHA256 7fec8343fa0bf846a7f4bcc50eced30daa16f17f3c1f9a7e346e7c659c41bee8
+EBUILD htbinit-0.8.5-r5.ebuild 1724 RMD160 1346c7b10ef02eeaeb5c69e494810b82147eb7f1 SHA1 cfc657dc51cae65f32ae8745ec8a53a44c644923 SHA256 54433d7570014572b2b4e0364c126e5706caa62ab97e892166b7f510997bc51e
+MISC ChangeLog 2874 RMD160 61995a69998908b44a20e528c0d1860709faf66c SHA1 04a910a0970398351fc057a87e51880c8534b58e SHA256 c1a1815c41b039e99220eefb3a1b0c9b23ea96c6a07225cf0dbde8f3765ca81e
 MISC metadata.xml 1012 RMD160 a4c7cb75d621355e212bd2478fd4c15a770f8bcf SHA1 1045408f36ab6a14c76b98577f788a77f0814e3f SHA256 afc1f8150431644140157e7e62525bce72491a5d9c645742c8c0d57728047c5c
diff --git a/net-misc/htbinit/files/htbinit.rc b/net-misc/htbinit/files/htbinit.rc
index 9f41fd1383d0..49e3aacb3139 100644
--- a/net-misc/htbinit/files/htbinit.rc
+++ b/net-misc/htbinit/files/htbinit.rc
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/files/htbinit.rc,v 1.2 2007/01/11 18:46:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/files/htbinit.rc,v 1.3 2012/01/01 00:56:46 idl0r Exp $
 
-opts="start stop reload stats list timecheck"
+extra_commands="stats list timecheck"
+extra_started_commands="reload"
 
 depend() {
 	need net
diff --git a/net-misc/htbinit/files/rc_htbinit b/net-misc/htbinit/files/rc_htbinit
index b4245404bb9c..22a8afd8c17d 100644
--- a/net-misc/htbinit/files/rc_htbinit
+++ b/net-misc/htbinit/files/rc_htbinit
@@ -9,13 +9,15 @@
 # ===
 #
 # htbinit
-# 
+#
 # A shell-script wrapper for HTB.INIT designed for
 # use in the SysV-init system (/etc/init.d).
 #
 # usage: htbinit { start | clear | reload | recreate | stats }
 #
-opts="start clear reload recreate stats"
+
+extra_commands="clear recreate stats"
+extra_started_commands="reload"
 
 depend() {
 	need net
diff --git a/net-misc/htbinit/htbinit-0.8.5.ebuild b/net-misc/htbinit/htbinit-0.8.5-r3.ebuild
index 7ede110755d3..d5907fbada8b 100644
--- a/net-misc/htbinit/htbinit-0.8.5.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5.ebuild,v 1.7 2010/10/28 10:08:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r3.ebuild,v 1.1 2012/01/01 00:56:46 idl0r Exp $
 
 DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2"
 HOMEPAGE="http://www.sourceforge.net/projects/htbinit"
diff --git a/net-misc/htbinit/htbinit-0.8.5-r1.ebuild b/net-misc/htbinit/htbinit-0.8.5-r4.ebuild
index ca6de3e275dd..d48cab715935 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r1.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild,v 1.5 2011/11/16 00:18:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r4.ebuild,v 1.1 2012/01/01 00:56:46 idl0r Exp $
 
 inherit eutils linux-info
 
diff --git a/net-misc/htbinit/htbinit-0.8.5-r2.ebuild b/net-misc/htbinit/htbinit-0.8.5-r5.ebuild
index 3447bd4288ed..6d31c2f584fb 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r2.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild,v 1.2 2011/11/16 00:18:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r5.ebuild,v 1.1 2012/01/01 00:56:46 idl0r Exp $
 
 EAPI=2
 inherit eutils linux-info