net-mail/cyrus-imapd: drop .la files, fix trivial bashism in init script

Closes: https://bugs.gentoo.org/843692
Closes: https://bugs.gentoo.org/843695
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 9 insertions, 6 deletions

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
index e7037f973119..a9eb170fa2a1 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
@@ -204,6 +204,8 @@ src_install() {
 			fperms 0750 "/var/${subdir}/${i}"
 		done
 	done
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
index ff38d8a5b3ab..53019d534474 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
@@ -219,6 +219,8 @@ src_install() {
 			fperms 0750 "/var/${subdir}/${i}"
 		done
 	done
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc8 b/net-mail/cyrus-imapd/files/cyrus.rc8
index 9d9e9452f565..e3be47fadf63 100644
--- a/net-mail/cyrus-imapd/files/cyrus.rc8
+++ b/net-mail/cyrus-imapd/files/cyrus.rc8
@@ -9,12 +9,11 @@ depend() {
 }
 
 checkdirs() {
-	for dir in /run/cyrus/{,proc,lock,socket,sync}
-	do
-	checkpath -q -d -o cyrus:mail -m 0750 "${dir}" || {
-                eerror "Failed to create directory at $dir"
-                return 1
-	}
+	for dir in /run/cyrus /run/cyrus/proc /run/cyrus/lock /run/cyrus/socket /run/cyrus/sync; do
+		checkpath -q -d -o cyrus:mail -m 0750 "${dir}" || {
+			eerror "Failed to create directory at $dir"
+			return 1
+		}
 	done
 }