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

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

7 files changed, 29 insertions, 18 deletions

diff --git a/app-admin/monit/ChangeLog b/app-admin/monit/ChangeLog
index bc9bd3993197..7f651a045c48 100644
--- a/app-admin/monit/ChangeLog
+++ b/app-admin/monit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/monit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.61 2011/12/31 16:25:27 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.62 2011/12/31 16:28:50 idl0r Exp $
+
+*monit-5.2.5-r1 (31 Dec 2011)
+*monit-5.2.3-r2 (31 Dec 2011)
+*monit-5.1.1-r1 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -monit-5.1.1.ebuild,
+  +monit-5.1.1-r1.ebuild, -monit-5.2.3.ebuild, +monit-5.2.3-r2.ebuild,
+  -monit-5.2.5.ebuild, +monit-5.2.5-r1.ebuild, files/monit.initd-5.0,
+  files/monit.initd-5.0-r1:
+  Revbump. Don't use the deprecated $opts variable, bug 381895.
 
   31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -monit-4.10.1.ebuild,
   -monit-5.2.1.ebuild, -monit-5.2.2.ebuild, -monit-5.2.3-r1.ebuild,
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 28ea13589a9e..4dbb29dfaa8e 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,10 +1,10 @@
-AUX monit.initd-5.0 618 RMD160 d8e488aeed8fe34d8aa69456c6f6d3f0ff162230 SHA1 e26532abcd3b3e02403c03c9fe501825e0a472c5 SHA256 9715991dfc26021689e878f74fa9c5c02a7a7504ba527c9ed0ed8f165bedaa04
-AUX monit.initd-5.0-r1 880 RMD160 2f06100a574dff54988dc571127e388aedf48969 SHA1 1a5673788b056bdb522abfa6669a30b7fa051726 SHA256 2e746a9ca995c76fc6cc995e0ec2f71b0e00eceee9610cbfd89451d469bcba17
+AUX monit.initd-5.0 628 RMD160 85eb1e47344881db40851cdc259e1e3d4d2812fc SHA1 79198c77b5d94171d14db4ebe4b2ece30bde1b1e SHA256 0318d35e6c74c80123e3de15627cb305da3f0c528508d17dd45d566cc9a21429
+AUX monit.initd-5.0-r1 905 RMD160 1326eafbba3614c484864837b6968c4579e75371 SHA1 48550b8e2d75c7cc37f68ac1bcea28c61f732e6a SHA256 78c013bb1258895a262c670a730e1319ea0f1140bbc3ca2f8dfc85ec02f923a1
 DIST monit-5.1.1.tar.gz 615924 RMD160 1b4fed4e039adfd626f3c49436702c0272948327 SHA1 cad2ff02a2f6dbfb5773d13e42506adb2165d15c SHA256 bf789e0660410e8c63f4b3dc2eeab9889347e6494a6dc1c0e764343cae0dc1ba
 DIST monit-5.2.3.tar.gz 618139 RMD160 6e82619df575c1bc372edc76db92a211adff9634 SHA1 dae1a63fca9a44cf1bda53691711b8273efe3935 SHA256 920f50e752cbdc8e2c7f009e1c54bfd46f5646ea22bbab96c58eb5d1a19a0d8c
 DIST monit-5.2.5.tar.gz 608861 RMD160 68cc1ce013626da10e421303840c9c768128f015 SHA1 41954b62a08663527d497084bd16d08b9a7b21bc SHA256 3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d
-EBUILD monit-5.1.1.ebuild 1178 RMD160 4eadbc13c3fe03493f33067c8f2687072ff70072 SHA1 7c263666ed1e91e77b4f8924804a8f0991fe0e33 SHA256 dc07f41d1588ffabb5b2f5297d47290149587447ad4ff91896ad5c95ecc8e1ac
-EBUILD monit-5.2.3.ebuild 1176 RMD160 f67f4c1acb52fcbae5b483f3adc5d1a143b67a6b SHA1 fd0a3d3f7dc77fadc634902657fb2bb058e4c005 SHA256 5b80922e24999e57a53555019dab033f3fce5a466ca6923d06b4c0fc701dc427
-EBUILD monit-5.2.5.ebuild 1184 RMD160 a42e22a582972dcb5ae8310db7106c7341ef687b SHA1 8b32100c387f0c59adde6f1530e951b66f4396e5 SHA256 3a9006304dafbcb783c543f6571599b45f653e6dad4b1b529d7d7a3e156951de
-MISC ChangeLog 7712 RMD160 e0cc31278f38b72019ffc0765a75290f2e20af32 SHA1 d0cfd951258c646b4eb300165cfb1d4b97b55338 SHA256 a71d0121f902edc2c37599356941c65a7ec532c2e3224af65cc8a3319f807248
+EBUILD monit-5.1.1-r1.ebuild 1178 RMD160 d77e8e414527bdd01076263ad2f92550b863a196 SHA1 8cb9090e684ceccd663250bbe31f5c13797aac86 SHA256 44346da04d2e4ef418d647589b5ced7f1b40c3a2543dbd970961a967375ea1b9
+EBUILD monit-5.2.3-r2.ebuild 1181 RMD160 346daa0c1138e0b41a180162c5818b8c55ace651 SHA1 21f56d5e72b3b158578c112ac662cd055cd15955 SHA256 3781a927e70b66b1e341db180c7990a3564c2290eacec564c282d54cb784a6ce
+EBUILD monit-5.2.5-r1.ebuild 1185 RMD160 aa6777e119df7720da97806f2da8489000cbe375 SHA1 2bc608eb13723bbd0835f1a27cf7a801900fe9b0 SHA256 0e1ae63d6403d5940f37d78501ea6a585608a518872885b4457a973a26683535
+MISC ChangeLog 8110 RMD160 f442837ad1a2842a4edb906ab141b53db03b733b SHA1 05e3c44bc2b136532b71053b5955dcd1279eca9b SHA256 6a2d16e48992ff1581ecdcd120dc590d69befebb07b0d72c6f6d9f96a98008a8
 MISC metadata.xml 261 RMD160 a0fbdbdeefcf2de58884ffefd882653a53233483 SHA1 2673be5f7f8076f2cd8cbd2f1534da690242946d SHA256 ac124e183c6da5584dfc0e5c96394d21644fee96e4903b35dbecd1889dda1459
diff --git a/app-admin/monit/files/monit.initd-5.0 b/app-admin/monit/files/monit.initd-5.0
index 476ade4f935d..aad734b65bc4 100644
--- a/app-admin/monit/files/monit.initd-5.0
+++ b/app-admin/monit/files/monit.initd-5.0
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0,v 1.1 2008/08/29 20:13:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0,v 1.2 2011/12/31 16:28:50 idl0r Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
 	use net
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
index 14e03131aa89..4163c988b805 100644
--- a/app-admin/monit/files/monit.initd-5.0-r1
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.1 2011/04/13 15:40:32 patrick Exp $
-
-opts="${opts} reload configtest"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $
 
+extra_commands="configtest"
+extra_started_commands="reload"
 
 depend() {
 	use net
@@ -19,6 +19,7 @@ configtest() {
         fi
         return $ret
 }
+
 start() {
 	ebegin "Starting monit"
 	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
diff --git a/app-admin/monit/monit-5.2.3.ebuild b/app-admin/monit/monit-5.1.1-r1.ebuild
index 98453ff19285..a3b70906d40a 100644
--- a/app-admin/monit/monit-5.2.3.ebuild
+++ b/app-admin/monit/monit-5.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.3.ebuild,v 1.5 2011/05/28 12:21:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.1.1-r1.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
 
 EAPI="2"
 
diff --git a/app-admin/monit/monit-5.1.1.ebuild b/app-admin/monit/monit-5.2.3-r2.ebuild
index 46683f7e9020..61c50565875f 100644
--- a/app-admin/monit/monit-5.1.1.ebuild
+++ b/app-admin/monit/monit-5.2.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.1.1.ebuild,v 1.6 2010/12/22 01:43:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.3-r2.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
 
 EAPI="2"
 
@@ -37,7 +37,7 @@ src_install() {
 	dohtml -r doc/*
 
 	insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
-	newinitd "${FILESDIR}"/monit.initd-5.0 monit || die "newinitd failed"
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
 }
 
 pkg_postinst() {
diff --git a/app-admin/monit/monit-5.2.5.ebuild b/app-admin/monit/monit-5.2.5-r1.ebuild
index cef99779358f..bf4bf6c3e88d 100644
--- a/app-admin/monit/monit-5.2.5.ebuild
+++ b/app-admin/monit/monit-5.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.5.ebuild,v 1.1 2011/04/14 14:06:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.5-r1.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
 
 EAPI="2"