Revbump. Don't use deprecated start-stop-daemon options, bug 376865.

(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force)

17 files changed, 58 insertions, 35 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index eb103c269e10..d6441da44c12 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.71 2011/12/30 09:46:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.72 2011/12/31 20:47:13 idl0r Exp $
+
+*zabbix-1.9.5-r1 (31 Dec 2011)
+*zabbix-1.9.4-r1 (31 Dec 2011)
+*zabbix-1.8.10-r1 (31 Dec 2011)
+*zabbix-1.8.9-r3 (31 Dec 2011)
+*zabbix-1.8.9-r2 (31 Dec 2011)
+*zabbix-1.8.8-r3 (31 Dec 2011)
+*zabbix-1.8.8-r2 (31 Dec 2011)
+*zabbix-1.8.7-r3 (31 Dec 2011)
+*zabbix-1.8.7-r2 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -zabbix-1.8.7.ebuild,
+  -zabbix-1.8.7-r1.ebuild, +zabbix-1.8.7-r2.ebuild, +zabbix-1.8.7-r3.ebuild,
+  -zabbix-1.8.8.ebuild, -zabbix-1.8.8-r1.ebuild, +zabbix-1.8.8-r2.ebuild,
+  +zabbix-1.8.8-r3.ebuild, -zabbix-1.8.9.ebuild, -zabbix-1.8.9-r1.ebuild,
+  +zabbix-1.8.9-r2.ebuild, +zabbix-1.8.9-r3.ebuild, -zabbix-1.8.10.ebuild,
+  +zabbix-1.8.10-r1.ebuild, -zabbix-1.9.4.ebuild, +zabbix-1.9.4-r1.ebuild,
+  -zabbix-1.9.5.ebuild, +zabbix-1.9.5-r1.ebuild,
+  files/1.4.6/init.d/zabbix-agentd, files/1.4.6/init.d/zabbix-server,
+  files/1.6.5/init.d/zabbix-agentd, files/1.6.5/init.d/zabbix-server,
+  files/1.6.6/init.d/zabbix-agentd, files/1.6.6/init.d/zabbix-proxy,
+  files/1.6.6/init.d/zabbix-server:
+  Revbump. Don't use deprecated start-stop-daemon options, bug 376865.
 
   30 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
   files/1.6.6/init.d/zabbix-agentd, files/1.6.6/init.d/zabbix-proxy,
diff --git a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
index 4ab04633df9b..d264bd7d3fc4 100644
--- a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd,v 1.1 2008/07/23 15:47:30 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd,v 1.2 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -11,12 +11,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
+	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
index 71d2be8e5be9..83aaf4c5c386 100644
--- a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server,v 1.1 2008/07/23 15:47:30 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server,v 1.2 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd
index 2cb5bf4f62b4..1e8e4591330c 100644
--- a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v 1.1 2009/09/01 13:41:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v 1.2 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -11,12 +11,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
+	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server
index 10c408ab6b0b..277132ecf3af 100644
--- a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v 1.1 2009/09/01 13:41:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v 1.2 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
index b77e792bbd30..afd0a35d04ec 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.3 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -11,12 +11,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
+	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
index 912a013baf79..e98240617722 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.3 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_proxy
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix proxy"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_proxy.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
index fccab4a1ecd3..d5d616ee3574 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.3 2011/12/31 20:47:13 idl0r Exp $
 
 depend() {
 	need net
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
 	eend $?
 }
diff --git a/net-analyzer/zabbix/zabbix-1.8.10.ebuild b/net-analyzer/zabbix/zabbix-1.8.10-r1.ebuild
index 0b0c5e6d6607..391cf438d3e4 100644
--- a/net-analyzer/zabbix/zabbix-1.8.10.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.10-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/net-analyzer/zabbix/zabbix-1.8.10.ebuild,v 1.1 2011/12/30 08:26:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.10-r1.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.7.ebuild b/net-analyzer/zabbix/zabbix-1.8.7-r2.ebuild
index c95007cda44e..307666200b34 100644
--- a/net-analyzer/zabbix/zabbix-1.8.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.7-r2.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/net-analyzer/zabbix/zabbix-1.8.7.ebuild,v 1.3 2011/11/03 00:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.7-r2.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.7-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.7-r3.ebuild
index 537b042b2d10..0459088c2d58 100644
--- a/net-analyzer/zabbix/zabbix-1.8.7-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.7-r3.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/net-analyzer/zabbix/zabbix-1.8.7-r1.ebuild,v 1.4 2011/11/03 00:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.7-r3.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.8.ebuild b/net-analyzer/zabbix/zabbix-1.8.8-r2.ebuild
index d9a41c3f1ec6..61f4094280d5 100644
--- a/net-analyzer/zabbix/zabbix-1.8.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.8-r2.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/net-analyzer/zabbix/zabbix-1.8.8.ebuild,v 1.2 2011/11/03 00:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.8-r2.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.8-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.8-r3.ebuild
index bf9fb8468dbb..307cf6e5f463 100644
--- a/net-analyzer/zabbix/zabbix-1.8.8-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.8-r3.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/net-analyzer/zabbix/zabbix-1.8.8-r1.ebuild,v 1.2 2011/11/03 00:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.8-r3.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.9.ebuild b/net-analyzer/zabbix/zabbix-1.8.9-r2.ebuild
index c3cc7d5cb822..18f048250f27 100644
--- a/net-analyzer/zabbix/zabbix-1.8.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.9-r2.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/net-analyzer/zabbix/zabbix-1.8.9.ebuild,v 1.2 2011/11/29 00:08:44 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.9-r2.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.9-r3.ebuild
index d20b574e9c17..2e9b534d83ce 100644
--- a/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.9-r3.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/net-analyzer/zabbix/zabbix-1.8.9-r1.ebuild,v 1.1 2011/11/29 00:08:44 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.9-r3.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.9.4.ebuild b/net-analyzer/zabbix/zabbix-1.9.4-r1.ebuild
index 5a500ccb67a6..34070ca8825e 100644
--- a/net-analyzer/zabbix/zabbix-1.9.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.9.4-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/net-analyzer/zabbix/zabbix-1.9.4.ebuild,v 1.5 2011/11/03 00:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.9.4-r1.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"
 
diff --git a/net-analyzer/zabbix/zabbix-1.9.5.ebuild b/net-analyzer/zabbix/zabbix-1.9.5-r1.ebuild
index ec3ca6fea229..17c1e782ac4b 100644
--- a/net-analyzer/zabbix/zabbix-1.9.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.9.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/net-analyzer/zabbix/zabbix-1.9.5.ebuild,v 1.5 2011/11/03 00:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.9.5-r1.ebuild,v 1.1 2011/12/31 20:47:13 idl0r Exp $
 
 EAPI="2"