Fix systemd service files. Patch by Salah Coronya. See bug #495068. Cleanup old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

5 files changed, 52 insertions, 5 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index c04edc92fe23..4e303838ff68 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.206 2014/04/23 23:04:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.207 2014/04/24 14:01:10 mrueg Exp $
+
+*courier-imap-4.15-r1 (24 Apr 2014)
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> +courier-imap-4.15-r1.ebuild,
+  +files/courier-authdaemond-r1.service, +files/courier-imapd-r1.service,
+  +files/courier-imapd-ssl-r1.service, -courier-imap-4.15.ebuild:
+  Fix systemd service files. Patch by Salah Coronya. See bug #495068. Cleanup
+  old.
 
 *courier-imap-4.15 (23 Apr 2014)
 
diff --git a/net-mail/courier-imap/courier-imap-4.15.ebuild b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
index 096808fd29ab..bd1d83be2c9d 100644
--- a/net-mail/courier-imap/courier-imap-4.15.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.15.ebuild,v 1.1 2014/04/23 23:04:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.15-r1.ebuild,v 1.1 2014/04/24 14:01:10 mrueg Exp $
 
 EAPI=5
 inherit autotools eutils multilib libtool systemd
@@ -184,9 +184,9 @@ src_install() {
 		doinitd "${initd}"
 	done
 
-	systemd_dounit "${FILESDIR}"/courier-authdaemond.service
-	systemd_dounit "${FILESDIR}"/courier-imapd-ssl.service
-	systemd_dounit "${FILESDIR}"/courier-imapd.service
+	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service courier-imapd.service
 
 	exeinto /usr/$(get_libdir)/${PN}
 	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
diff --git a/net-mail/courier-imap/files/courier-authdaemond-r1.service b/net-mail/courier-imap/files/courier-authdaemond-r1.service
new file mode 100644
index 000000000000..239821647c26
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-authdaemond-r1.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Courier Authentification Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/lib/courier/courier-authlib/authdaemond
+ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/lib/courier/courier-authlib/authdaemond
+PIDFile=/var/run/authdaemon.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imapd-r1.service b/net-mail/courier-imap/files/courier-imapd-r1.service
new file mode 100644
index 000000000000..9510b31041d8
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imapd-r1.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Courier IMAP Daemon
+After=network.target
+Wants=courier-authdaemond.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/courier-imap/imapd
+ExecStart=/usr/lib/courier-imap/gentoo-imapd.rc
+ExecStop=/bin/kill $MAINPID
+PIDFile=/var/run/imapd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imapd-ssl-r1.service b/net-mail/courier-imap/files/courier-imapd-ssl-r1.service
new file mode 100644
index 000000000000..79ae0dc93cae
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imapd-ssl-r1.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Courier IMAP Daemon
+After=network.target
+Wants=courier-authdemond.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/courier-imap/imapd-ssl
+ExecStart=/usr/lib/courier-imap/gentoo-imapd-ssl.rc
+ExecStop=/bin/kill $MAINPID
+PIDFile=/var/run/imapd-ssl.pid
+
+[Install]
+WantedBy=multi-user.target