Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts variable, bug 386757.

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

5 files changed, 25 insertions, 15 deletions

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 3e58cb89f257..24256ee90626 100644
--- a/dev-vcs/monotone/ChangeLog
+++ b/dev-vcs/monotone/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-vcs/monotone
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.20 2011/09/12 10:41:42 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.21 2012/01/01 01:13:34 idl0r Exp $
+
+*monotone-1.0-r3 (01 Jan 2012)
+*monotone-1.0-r2 (01 Jan 2012)
+*monotone-0.99.1-r1 (01 Jan 2012)
+
+  01 Jan 2012; Christian Ruppert <idl0r@gentoo.org> -monotone-0.99.1.ebuild,
+  +monotone-0.99.1-r1.ebuild, -monotone-1.0.ebuild, -monotone-1.0-r1.ebuild,
+  +monotone-1.0-r2.ebuild, +monotone-1.0-r3.ebuild, files/monotone-0.36.initd:
+  Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts
+  variable, bug 386757.
 
   12 Sep 2011; Peter Volkov <pva@gentoo.org> monotone-1.0-r1.ebuild:
   Fixed build with USE=doc, bug #380257 wrt Juergen Rose
diff --git a/dev-vcs/monotone/files/monotone-0.36.initd b/dev-vcs/monotone/files/monotone-0.36.initd
index 442707527cc7..fab2f03f1ef1 100644
--- a/dev-vcs/monotone/files/monotone-0.36.initd
+++ b/dev-vcs/monotone/files/monotone-0.36.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
+# Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.1 2010/03/05 16:49:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.2 2012/01/01 01:13:34 idl0r Exp $
 
-opts="import"
+extra_commands="import"
 
 depend() {
 	need net
@@ -27,7 +27,7 @@ dbexists() {
 	if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then
 		ebegin "Creating monotone database"
 		start-stop-daemon --start \
-			--chuid ${MTN_USER}:${MTN_GROUP}  \
+			--user ${MTN_USER} --group ${MTN_GROUP}  \
 			--exec /usr/bin/mtn -- ${MTN_COMMON} db init
 		eend $?
 	fi
@@ -36,9 +36,9 @@ dbexists() {
 		export MTN_PWD=${RANDOM}
 		yes "${MTN_PWD}" | \
 			start-stop-daemon --start \
-			--chuid ${MTN_USER}:${MTN_GROUP}  \
+			--user ${MTN_USER} --group ${MTN_GROUP}  \
 			--exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY}
-			
+
 		eend $?
 		# Update the password lua hook
 		cat > ${MTN_CONFDIR}/passphrase.lua <<EOF
@@ -62,7 +62,7 @@ start() {
 
 	ebegin "Starting monotone server"
 	start-stop-daemon --start --background \
-		--chuid ${MTN_USER}:${MTN_GROUP}  \
+		--user ${MTN_USER} --group ${MTN_GROUP}  \
 		--exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \
 		--key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve
 	eend $?
diff --git a/dev-vcs/monotone/monotone-0.99.1.ebuild b/dev-vcs/monotone/monotone-0.99.1-r1.ebuild
index 4fc309d90a04..03e650047714 100644
--- a/dev-vcs/monotone/monotone-0.99.1.ebuild
+++ b/dev-vcs/monotone/monotone-0.99.1-r1.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/dev-vcs/monotone/monotone-0.99.1.ebuild,v 1.5 2011/09/05 13:33:03 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.1-r1.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $
 
 EAPI="4"
 inherit bash-completion elisp-common eutils toolchain-funcs
diff --git a/dev-vcs/monotone/monotone-1.0.ebuild b/dev-vcs/monotone/monotone-1.0-r2.ebuild
index efb9704b67eb..fe228e0b8774 100644
--- a/dev-vcs/monotone/monotone-1.0.ebuild
+++ b/dev-vcs/monotone/monotone-1.0-r2.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/dev-vcs/monotone/monotone-1.0.ebuild,v 1.2 2011/09/11 11:26:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $
 
 # QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
 EAPI="4"
diff --git a/dev-vcs/monotone/monotone-1.0-r1.ebuild b/dev-vcs/monotone/monotone-1.0-r3.ebuild
index 0d1870f754e8..1f0228dd1ae9 100644
--- a/dev-vcs/monotone/monotone-1.0-r1.ebuild
+++ b/dev-vcs/monotone/monotone-1.0-r3.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/dev-vcs/monotone/monotone-1.0-r1.ebuild,v 1.3 2011/09/12 15:21:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r3.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $
 
 # QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
 EAPI="4"