From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29AD61382C5 for ; Mon, 10 May 2021 09:28:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7964BE0798; Mon, 10 May 2021 09:28:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CF20E0798 for ; Mon, 10 May 2021 09:28:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AB33340FB5 for ; Mon, 10 May 2021 09:28:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72C174A0 for ; Mon, 10 May 2021 09:28:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620638877.bccff51c278212c7e7a92ed17f71dc5d503d768e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild X-VCS-Directories: net-mail/cyrus-imapd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bccff51c278212c7e7a92ed17f71dc5d503d768e X-VCS-Branch: master Date: Mon, 10 May 2021 09:28:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 099ec431-6778-4daa-9be3-123f0bab5a29 X-Archives-Hash: 6dcf5775864ded8ef2f77552a998a870 commit: bccff51c278212c7e7a92ed17f71dc5d503d768e Author: Sam James gentoo org> AuthorDate: Mon May 10 09:27:57 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 10 09:27:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccff51c net-mail/cyrus-imapd: tidy up ebuild for 3.4.1 Signed-off-by: Sam James gentoo.org> net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild | 33 +++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild index d6d5a4de007..d0c9a1d5d28 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild @@ -28,15 +28,19 @@ CDEPEND=" calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) - http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) + http? ( + dev-libs/libxml2:2 + dev-libs/libical:0= + net-libs/nghttp2 + ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( - sys-libs/pam - >=net-mail/mailbase-1 - ) + >=net-mail/mailbase-1 + sys-libs/pam + ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] ) @@ -156,32 +160,33 @@ src_install() { dodoc README* dodoc -r doc - cp -r contrib tools "${D}/usr/share/doc/${PF}" - rm -f doc/text/Makefile* - mv "${D}"/usr/libexec/{master,cyrusmaster} || die + cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die + rm -f doc/text/Makefile* || die + + mv "${ED}"/usr/libexec/{master,cyrusmaster} || die insinto /etc - newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf - newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf + newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf + newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ - "${D}"/etc/imapd.conf + "${ED}"/etc/imapd.conf || die sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ - "${D}"/etc/cyrus.conf + "${ED}"/etc/cyrus.conf || die # turn off sieve if not installed if ! use sieve; then - sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die + sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die fi # same thing for http(s) as well if ! use http; then - sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die + sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die fi newinitd "${FILESDIR}/cyrus.rc8" cyrus @@ -218,7 +223,7 @@ pkg_preinst() { pkg_postinst() { # do not install server.{key,pem) if they exist if use ssl ; then - if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then + if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then install_cert /etc/ssl/cyrus/server chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} fi