fix init script dependencies and indention (bug #217941, comment #3)

Package-Manager: portage-2.1.5_rc4

4 files changed, 34 insertions, 30 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 742813d1b522..ce6efda23ae9 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.159 2008/04/17 16:16:21 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.160 2008/04/21 17:07:52 wschlich Exp $
+
+  21 Apr 2008; Wolfram Schlich <wschlich@gentoo.org> files/dovecot.init,
+  files/dovecot.init-r1:
+  fix init script dependencies and indention (bug #217941, comment #3)
 
 *dovecot-1.1_rc4-r1 (17 Apr 2008)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ae74f4c05d47..bf550c14b70e 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,7 +1,7 @@
 AUX dovecot-1.0.13-body.patch 840 RMD160 7bc36d98943eede3d358b574e6dab8a6d9d44aba SHA1 f83bde6ec9f7a422c5807076b515b2e4b9067c37 SHA256 0af400d465e84e2978f5351a2e8e88e6b551728c91f2757145bcee8be5e076d4
 AUX dovecot-1.1_rc3-body.patch 3823 RMD160 97cfc87fe4b12d24b152e7966bb500838d4b3d7a SHA1 03583a2b047d04184199732b41a6ad5b82c8dde0 SHA256 058d8b89265c7ed070d504934893860220e383355fcfe41147e27af04772957d
-AUX dovecot.init 890 RMD160 376dca3d8b422dd4d5cb7c4d47adc51de9222908 SHA1 b34d2658961ab250b1e3790287e5ea2e6ffa0307 SHA256 401302b57efdb00c76aef03e16e927af47007f222b98413ab3f4f1fa83f2813f
-AUX dovecot.init-r1 1686 RMD160 583347e2b438e4e5335263927132dafe186f372f SHA1 1de3dc0e4e611c129caedad27729a1926a60aa74 SHA256 1bff6bfe3a2dd0bae937d13e00c92657ac1b73be0e8cfd5d4cc3a9f6a1839ead
+AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
+AUX dovecot.init-r1 1670 RMD160 1c147fe3780adcee11009695adc8e10ee5a33100 SHA1 ee708766e5657b8cfce7b4fc02305506d9cff049 SHA256 bdd58f6466fdb0cd98f46ac8493cc73f80c3e13a15283e3dc267707717d17412
 DIST dovecot-1.0.13-MANAGESIEVE-v9.2.diff.gz 104733 RMD160 15add312a917580a449cfc09539f279e574529eb SHA1 cd08eef3d1b4d8bef36af7f79675bfe194f16962 SHA256 65c86d9a9b1beaa3a5ed3b2a8dffec501444e30310e7f663a373d493618c8e19
 DIST dovecot-1.0.13.tar.gz 1774025 RMD160 1ba2c6b14e41c9bc4d36c12ea90a0fad024409db SHA1 8690b27d01e8a68edef5ed162681c79f4074c9c1 SHA256 16da29b2bc08d0178a09323bf0787a2a0e953075655566a7b4b6b148c87ac25f
 DIST dovecot-1.1-managesieve-0.10.1.tar.gz 383509 RMD160 dfd207bb563c4a2f5f529f475c60088ad462883b SHA1 4c5418315d21a560bd1ed0551bb65a24cd3d9c41 SHA256 216c1d0904a881d3143d92ce282a477b68a4e0cf3eaea59bb091f7c664919ee9
@@ -13,5 +13,5 @@ EBUILD dovecot-1.0.13-r1.ebuild 7260 RMD160 79199932af7ae5a3b7d477e05966364297ff
 EBUILD dovecot-1.0.13-r2.ebuild 7336 RMD160 0992d0fdcc24cd290f83a34c9dfd82263903272b SHA1 2d57f282070e95a9c67d9d441b3b651808d9243c SHA256 b9cd5fc85db31272683fe9889334656372571ea0a7c627d2ef6c37d2d38df69e
 EBUILD dovecot-1.1_rc4-r1.ebuild 7870 RMD160 8979971bf8494f4cfd5214f4a08de1ebfe16527d SHA1 6c60eade0c7ccd89f0c2dae7c5d530269ab4f651 SHA256 75964acd6952cf42f47d5039b1e6b5327defbfbdb93f75b4e956ad64ea84999a
 EBUILD dovecot-1.1_rc4.ebuild 7864 RMD160 7503a88d253ef2b4dbb2f0e99585a0e18762ab6f SHA1 d655042c8ba55956320e62cd8e615a0a12c51ba3 SHA256 54eb263cad095d1468bcf9dc18040e285b25a9e522ea94021d584b04e470686a
-MISC ChangeLog 25324 RMD160 d9aa527e8dd7f03479ef530bc44cea32e304f9a1 SHA1 f3504802c12b8bc4844eebd988f5d9322175269c SHA256 b1b495de4686e81954d9f9151149404f2a56bd8b2323c26e8944243c55536a90
+MISC ChangeLog 25494 RMD160 10632980ed7d65be4b1cfaf14798e5e0a6ab3ebe SHA1 4a28800e46d57062471cc38a5880ba5144c3e81f SHA256 bc7afb3ecdff7c9e7a6871ab540f05780ea01441871727443ea51debc93a9370
 MISC metadata.xml 307 RMD160 ed31b92a1f8c8c5c1cc6166bc0136dd03299bb9b SHA1 ac1cb79f5d3340ed9a9d3117531c1c7fa2af8edf SHA256 180d5598a7d709bf7969219969218d54d7283af53b238bf74c3f7223ca2190ef
diff --git a/net-mail/dovecot/files/dovecot.init b/net-mail/dovecot/files/dovecot.init
index 505e25b2f593..4bd5c5014e4f 100644
--- a/net-mail/dovecot/files/dovecot.init
+++ b/net-mail/dovecot/files/dovecot.init
@@ -1,33 +1,33 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v 1.5 2007/11/02 13:40:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v 1.6 2008/04/21 17:07:52 wschlich Exp $
 
 opts="reload"
 
 depend() {
-    need net
-    after ldap mysql ntp-client ntpd postgresql saslauthd slapd 
-    use logger
+	need localmount net
+	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
+	use logger
 }
 
 start() {
-    ebegin "Starting dovecot"
-    start-stop-daemon --start --exec /usr/sbin/dovecot \
+	ebegin "Starting dovecot"
+	start-stop-daemon --start --exec /usr/sbin/dovecot \
 		--pidfile /var/run/dovecot/master.pid
-    eend $?
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping dovecot"
-    start-stop-daemon --stop --exec /usr/sbin/dovecot \
+	ebegin "Stopping dovecot"
+	start-stop-daemon --stop --exec /usr/sbin/dovecot \
 		--pidfile /var/run/dovecot/master.pid
-    eend $?
+	eend $?
 }
 
 reload() {
-    ebegin "Reloading dovecot configs and restarting auth/login processes"
-    start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
+	ebegin "Reloading dovecot configs and restarting auth/login processes"
+	start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
 		--pidfile /var/run/dovecot/master.pid --signal HUP
-    eend $?
+	eend $?
 }
diff --git a/net-mail/dovecot/files/dovecot.init-r1 b/net-mail/dovecot/files/dovecot.init-r1
index ab85fe80cb79..47bc60239c18 100644
--- a/net-mail/dovecot/files/dovecot.init-r1
+++ b/net-mail/dovecot/files/dovecot.init-r1
@@ -1,14 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1,v 1.1 2008/04/17 16:16:21 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1,v 1.2 2008/04/21 17:07:52 wschlich Exp $
 
 opts="reload"
 
 depend() {
-    need net
-    after ldap mysql ntp-client ntpd postgresql saslauthd slapd 
-    use logger
+	need localmount net
+	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
+	use logger
 }
 
 checkconfig() {
@@ -34,23 +34,23 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --exec /usr/sbin/dovecot \
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dovecot \
 		--pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
-    eend $?
+	eend $?
 }
 
 stop() {
 	checkconfig || return 1
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --exec /usr/sbin/dovecot \
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dovecot \
 		--pidfile "${DOVECOT_PIDFILE}"
-    eend $?
+	eend $?
 }
 
 reload() {
-    ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
-    start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
+	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
+	start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
 		--pidfile "${DOVECOT_PIDFILE}" --signal HUP
-    eend $?
+	eend $?
 }