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

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

6 files changed, 30 insertions, 32 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/Manifest b/dev-vcs/monotone/Manifest
index a4fe5a2c00df..77d9f71825f8 100644
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 50monotone-gentoo.el 1217 RMD160 82532c08ab1409fe2a9a643baf0f769841f39db2 SHA1 ccdd819dd1e497a5dd546df3b898a8f3efce2e45 SHA256 bfd32a5f57abd47bd6bc35ce27c2a31dfd1c1f7517d869fc0bca6b715d8ea259
 AUX hooks.lua 154 RMD160 0297c570bafe350a4160a46351c00f46ea4fc1ef SHA1 f31bdd8d567639b2aa427e98b2df47351a8e1237 SHA256 55e17360a14ccf70d2da5b3e3ad038b1021c30f4be5c69029f50bd1ec8cbf326
-AUX monotone-0.36.initd 2431 RMD160 bfa9672644eb07cbdfc2a03f7e20c557f2b5cc97 SHA1 448eea7bf3bdf14c85ce01d7197d04cfacedd89d SHA256 361cd19633a64f6b037b98ac50a2622d8856ff2dffb89c0b11b45660ba43bdb6
+AUX monotone-0.36.initd 2464 RMD160 dc322b764f7e3a7f6658860ed1eaa8eee36060db SHA1 1bb8751a8201c97601ef31bcdd6424daa533d959 SHA256 c561618b38e7efce2a175bc166f1b4dfb9fcbb87ccb61e3df02f8dc9b7e615f2
 AUX monotone-1.0-bash-completion-tests.patch 760 RMD160 71fb25614ca3e7fc2afcc15291ab9a39af6fa859 SHA1 59f6ed8b405fdc11068d97279397644272293eca SHA256 bd5f78ccc627ab7f58d4b628c8bfbbaffe07e7ba8f5434d3ec823e8922aba401
 AUX monotone-1.0-botan-1.10.patch 16771 RMD160 4403fbf7ca9e40aaab150db5e90747dd828dc957 SHA1 8d6b89d015be32418b96c58a8e0a2122a28b88e0 SHA256 79ae0d0925138d0f84fa0af4b4f8d3464f5791a4cba97f7c21ea435301d336e9
 AUX monotone.confd 803 RMD160 507ee4058e6f8197bd0b7a25f1115ec42ae226ec SHA1 1887e76fd00585344e614c3392527866bb94614c SHA256 4e266a08108441438fb4b3ac40216e731378d378593807b0826f58446c346e5b
@@ -11,17 +8,8 @@ AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b8
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
 DIST monotone-0.99.1.tar.gz 4940291 RMD160 c0db85af8b584e375ca992b3384bd8a38d5b380e SHA1 e74ba571b358f6b76370f882d15ddbd1edd9f37e SHA256 204ebb12f36599ac4c105ae5bf45edd7da13a4e57dc45f31789634fc8c2b30a1
 DIST monotone-1.0.tar.bz2 3588074 RMD160 4c0813ae0c11f271dc88f42dd8814e474a67e988 SHA1 aac556bb26d92910b74b65450a0be6c5045e2052 SHA256 5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc
-EBUILD monotone-0.99.1.ebuild 3288 RMD160 53d5667793dc8f63d4ca35d858a3f59bca25026a SHA1 94f10eb61ef62422053e18c91f5a43c6a2424de4 SHA256 fba553e9fbe3020e8cad865e257c937bd66f014036f6849604ade3ba431a606c
-EBUILD monotone-1.0-r1.ebuild 3294 RMD160 a51b099397782ecd188fc838508f66a22fabfd10 SHA1 7520750a47475042dad85fa30a81e3aa59138eef SHA256 6e004ce2275e68bcfcaed562c71f56aeb2ae8803ca31b6795f2872bb74ed85fc
-EBUILD monotone-1.0.ebuild 3586 RMD160 8ba3b32ce4e7f85f19d69b6179426878645aebcb SHA1 e6e9551ef245cffbbe50edfa166c616b11c80895 SHA256 8eaf5d57c154b3ea7c60a81957fb12c5166841e2f51a93c759d1d72563f23023
-MISC ChangeLog 14420 RMD160 b6cb66c8ea2ea5bf920aba15aa45ec45cb8250ba SHA1 dd15b103202d9116897bdf08ef768c4c7908da72 SHA256 5ab5b5de90d288f1786ee01df17ae6c368f455fdeae35682407f609103dc3664
+EBUILD monotone-0.99.1-r1.ebuild 3293 RMD160 ad432f122bf80002e0bb4e73d01a7e27bf8712f2 SHA1 37a704d4348c98876108333a7404a0c231488b02 SHA256 d712ac8b9b2ceb96f771747c5fa0cb9fe4f6fd5e4e2b7f5980cf7f3486089c49
+EBUILD monotone-1.0-r2.ebuild 3591 RMD160 59bc6acb0f27431d837f53fb9dd8c21f502885cf SHA1 03502350eaeec7d01e71f760673d8160dd3683b3 SHA256 c7668530ad248b663f78c24f5545bf30fd40e66f29259ef6caefbb7d6a7bb04d
+EBUILD monotone-1.0-r3.ebuild 3290 RMD160 ee100be01ab48ddae57a83dd26e8fa550c647d8e SHA1 71e5c6a6f3d26ffc52a547d2184baab4ca9a88b8 SHA256 d4770e2be40d6aeaab6f81e0cb93e3690c6c87782171f4d2e6c6732ed59f0897
+MISC ChangeLog 14856 RMD160 f18768f28ad66bc1531a681d3c755f159cf04c1c SHA1 1294a384a27600e0544ec8eb20127dcc4e0ef416 SHA256 5099c4277608798b929b5edc65aeaef6f55a189bfa1f14da20d25ac1438b3308
 MISC metadata.xml 991 RMD160 3acf16e7c7f41e0213c4b375ab7db39859be8900 SHA1 7e1b7e8360577c3e1ae8550711f443ad7e410a76 SHA256 ffedc0e4cff4495d7569eeba2ef0938a5d0c6b655e7c941326d22353af88ffb0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59nKUACgkQfXuS5UK5QB1edgP+PBXHem3f0zgo668hRyWrh2y6
-BWHsas9XWO7+hSexWm62t/JXZwcCmvQCXLkOXlLhtoujFN4Bt/+y1Zx7IG7Mprfb
-LVwgTyNx0lHauFKG2zwuq/uDN6v5m4GRLsbwQGahvHSev1vrvy3RIHVwa2Ie+oDm
-glniF+qII9uAMomWdJI=
-=2IPP
------END PGP SIGNATURE-----
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"