projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c4be42)
use dosbin instead of exeinto /usr/sbin/ && doexe
authorJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 21:35:19 +0000 (21:35 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 21:35:19 +0000 (21:35 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

net-mail/courier-imap/ChangeLog patch | blob | history
net-mail/courier-imap/Manifest patch | blob | history
net-mail/courier-imap/courier-imap-4.15-r1.ebuild patch | blob | history
net-mail/courier-imap/courier-imap-4.16.0.ebuild patch | blob | history

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 474a2984ecdfae3898af4d05c79370d6abeddb21..78615eaa93bdc1acb483477d5a828b234ad38e7b 100644 (file)
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.226 2015/02/09 17:01:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.227 2015/03/21 21:35:09 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> courier-imap-4.15-r1.ebuild,
+  courier-imap-4.16.0.ebuild:
+  use dosbin instead of exeinto /usr/sbin/ && doexe
 
 *courier-imap-4.16.0 (09 Feb 2015)
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 5a8d6ffe074dfbe50ddae82085d57341160e006d..2eaffb71cf466567b7ae9e126bfd3f9a523131ef 100644 (file)
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX courier-authdaemond-r1.service 373 SHA256 c5b647b2f72f8f3097a093d929d021b2ec758e5f8183c7990dfb56af2eed9f8e SHA512 5ef9b65c24700f93a31626d2a657e19165853151e5c33eb96b0d41b818b4669a2785dfb868054231df20acfdfc4218a0bbc7e21260e337a3075c54f97ba9c46b WHIRLPOOL edc6e642105862d7cc3a2b10ae28ea08a9d17a30d99c7620615da74fe2f587a4fae827d656cba0ae0395126dfd72d171172b4ada611e1b0cb8669e02b45bb4f8
 AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1199 SHA256 7acf02d3dfbbfe691da7f89034a021b948999c125c1a83fb4742c4c219aaf01f SHA512 b0cc0fc54dde4cc2f5c81d2b3ce8223da1705d00f90d4cf72594b695ed203384baefe5ddc0b8ac9c3ed5d69b9bec393d367317a477e89f5ba7a9db3eea704324 WHIRLPOOL e32f0a8910934dde4bee8303772da3cd1a3ff9e66b389a840011551dd8dbba0fb7f87d150ae1f01ed4259439648f1f3f127eae2f463712e185dd2a7b955b4dfc
 AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 SHA256 5d2e175e20aa5d7b7049a76be847a9bd974d25625b5324ac8f23680cb7e734bc SHA512 22108e1a09e9fc6e6c035ca7f55ba382ec87bf889dd88c2f9934b087d285853a6eb8453fadfe456f9a6de57f973c988bbaba8ec449366f0df8396b430b1d64bf WHIRLPOOL c111c0cf627a4ca0287faeba60ed15a40b8925e1e0d0bec4b58a783feed2073a129a78b0578e0b309a0dafec00a2aac8b1427395bb65454a51d3c475c86a0f08
@@ -20,7 +23,26 @@ AUX mkimapdcert 996 SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4
 AUX mkpop3dcert 996 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 WHIRLPOOL 7b30ab63852376236717eb7cd230b453e2144f56641f506bd47b5fbea645fd7ac53c9147a9e3707a8b0233e74218f69c6b6d8c0f8ff764b3aa13a18d22d966b8
 DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2
 DIST courier-imap-4.16.0.tar.bz2 3021228 SHA256 20ee63fbb5eef671dfcceecf3ed3eb48663cff3bcb607ecc904d0bc4f8c0b4b2 SHA512 5f84c035e3936cf2b435efee7ecb98f98da8ecdd3afa3661ba03737d870aa038586a49c3a696fd8d028302349279139e90b1befc1d42a8488909c0ca0ea96a5c WHIRLPOOL be8b916ff9526c0a34cbad210bb026ab176a327eba4c4e5d76da7d99e800418749b0ab50bff9ce9a7378ddfd9342a86ad3462e4418e0d36bad159ed2db3af069
-EBUILD courier-imap-4.15-r1.ebuild 7463 SHA256 781a942d00ef4afaa33beb9777d1022523c4d1be01a5a1614854851946755e0f SHA512 fd9abfdbd42f8c93626da89fe91ba2a3ace48994e3a8a9bb8fa6862cb4da93a17f87b9a82e272a9a7774b9073624df7e51590e064dca658314608f80a707e9f2 WHIRLPOOL 9d160b263cd34868aa539c9ec634bb244f500c4b3c1f6ac7929c7b607df8e4acac5f19afc87861a7b50b5094af0a51ce3738071af3a4ada7e9d446b08ca34053
-EBUILD courier-imap-4.16.0.ebuild 6953 SHA256 3a434fbfd576aa3c633a73f62d7101930f7f642d72d131da2e97a83e0a61268d SHA512 1d3bbd2505fcee20effe61ea3934172e8b091d90fb6e12c610e10537404dfce88851c6e9e4238dbe3407c3660f0a2833f6f2d8e0c1888fe733c8a4001331b116 WHIRLPOOL 69488c2bf3e9540a32af7ecce3b9a5552dd3da4750f9c54deb9bb18b72e8a8ef6111fe29595d3e383b68b3cee9162961a9dcff0abd63cb940c0566c9f064c151
-MISC ChangeLog 44901 SHA256 78f619962c62f23434a5791be24d5580b1de632b2e4feddf9f6fb61d6dab4c01 SHA512 9d0ccc76449077621fdd7f4313380663a98957d3bb6b9131c02da1c9f1bee5175968ffa8d2ad678ff2effe5ba4cb2363b1c4eacec6b62a0bbdba3fa0476a7dba WHIRLPOOL a0f823d0e5abeb87e54dc842f281697ae7a5234974051241387d3d36aa6ab738a898b56ebb8233b5c2511dee4afd5db7e94ac76fdc70ff00bc6b5bf5a6bf284c
+EBUILD courier-imap-4.15-r1.ebuild 7508 SHA256 e92514a96b9fd54aa5cea320a2fafbb97c6e7db4b10e31eddf85f91562c74d34 SHA512 2c61c58895876b43d37fc94ac64cf31f1e045f6060ade66df14d5cf4d06d893b9ee7d09be8f433a3565dd2cbdb7626578575eb06bb27def144c6c3ce07ad74b7 WHIRLPOOL 66f7ae977b13d597cf3e5b3bbd97756a86f6e6a07a2dee56efd5ec7d793ca1f4b798edfaa6b966260f49aedb10803b7f88fa418c95c8041a09a41e3f937ca640
+EBUILD courier-imap-4.16.0.ebuild 6953 SHA256 fb8e002cfec73da29d1b556b2411b32e33089c4431f26192119543f64932bc0b SHA512 726b162dd92076536467ebce7d2274d0edd13f348ea8e41d417a07ff5daef5de365670c2a6ac7c55dd739e32d01739ad1eb55b062339a645036e841d5f5cea4e WHIRLPOOL ecb4f0caa6722f87da06bd1244751fac02d91bcb18e7a5a4566c12ad35adc0a197ae8bfb7e39ce0b925c7bafae13e1c8f614bad2c020ed52482f6630e20d3554
+MISC ChangeLog 45059 SHA256 0b8abf809b084830372ed893f8a1c53c70f4e24a9a1aa97d0ff852c9e7aeb0d4 SHA512 4e1812c4297b7d567e24fb1fe0214e2575b92c1e49286454be11a57daf29bb0942410667c451342ec0aaaeb4d50486913d28abf67057e8d9d5da8a783b671c01 WHIRLPOOL 900d7e06c34f4c17fd4e44094c068c11e06731914cbc693721b65a7e3b573addde2e9d157b0aa29510ee184005722c0c87942e894eb05a975fc284cfc1ba82b2
 MISC metadata.xml 576 SHA256 aab2906be52f2b1987f006050f22a439308e1b140285ed086221f0bffa4f4702 SHA512 54dab1ce583b4003961fd2e19aef6b575f04c92381007bfe530c05dcae0c8e2f004dcd8e337b5541a89bf4be4a71ba5652649f8edd2135c9962287a7fbd61310 WHIRLPOOL 7b92ef48fefc565f6737cffb4f7f7404d7a95cfa50f40c051f9e0d98edeb2a022c3c168823bc3387f002723961afc5ec045b90c525e83c719762b2d70fa7ec5e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDeQXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirdaIP/3CocuZk10PpgNPEqLJDdSW2
+h5C3iMquU/suE+Ikg3bn0im4g8cBAj+31fGMZ49n4hH4N7xrf2V7Kt7gxf0M14O0
+h1x7FvpKWfRLmU864GcjRhNg2ERe84uY1esa02KYk/1IIF3g1K9TiuBXcfgPN5XF
+hKeRXyuyCZHG2EFkCV47/LCceBh7VvlzfUx7h7mAj2J7MtZ4v98Udl0XlFDmnQ7H
+meugd9IYqKVxOmZJd5APp0Yj8JbpaWHI9oPn9ceW8ptPBbmettWQ3JwYR3de9Y6W
+/DwIqktWbFJnm1kZBKVAgreCjmbk+Sbd+UPnQoHDyKaSyVDlPbqG7TKqUVbfG5A7
+pPCtifdTZWqs/7ou8cGvs7PGlMq/pvao8X94487PgpCgG+rg5OmWsLwFgVufPYBQ
+kH/VpkauUHPaGHh1D6KhHuq7YvItVsegZSwbhePwGUIJlm+ZTT7FJwlcKOd5oJHR
+La/lYzVSJ2u+6iWF/Mo0PP8g28h5ukSN/SaJaUzynE8bPeOC2y+Mv135cuwwQNwe
+wLgl4ou9WRrruaq7QsOBnTJTdOcQj6y23Q3kQ1NPc33rS1Y3fMf24DNS6Yvnf3VT
+IcjoKmbb/iUU5VMwA8yjabWW2aOQa5juZ4HJhtQTLolS7SHe9Hg/bCvINhWvPNJi
+NQzUs96p1nsq+bn0BNCg
+=wXlt
+-----END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
index 89b9c785cfc58b7011d960f194294b015700566d..3f8797186666156f8abbb601be2925941eeeac9e 100644 (file)
--- a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r1.ebuild,v 1.14 2014/11/21 10:06:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.15-r1.ebuild,v 1.15 2015/03/21 21:35:09 jlec Exp $
 
 EAPI=5
-inherit autotools eutils multilib libtool systemd
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+inherit autotools eutils multilib libtool systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
+
 REQUIRED_USE="|| ( berkdb gdbm )"
 
-CDEPEND="gnutls? ( net-libs/gnutls )
-               !gnutls? ( >=dev-libs/openssl-0.9.6 )
-               >=net-libs/courier-authlib-0.61
-               >=net-mail/mailbase-0.00-r8
-               berkdb? ( sys-libs/db )
-               fam? ( virtual/fam )
-               gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+CDEPEND="
+       gnutls? ( net-libs/gnutls )
+       !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+       >=net-libs/courier-authlib-0.61
+       >=net-mail/mailbase-0.00-r8
+       berkdb? ( sys-libs/db:= )
+       fam? ( virtual/fam )
+       gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 DEPEND="${CDEPEND}
-               dev-lang/perl
-               !mail-mta/courier
-               userland_GNU? ( sys-process/procps )"
+       dev-lang/perl
+       !mail-mta/courier
+       userland_GNU? ( sys-process/procps )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-courier )"
 
@@ -52,7 +55,8 @@ src_prepare() {
        # These patches should fix problems detecting BerkeleyDB.
        # We now can compile with db4 support.
        if use berkdb ; then
-               epatch "${FILESDIR}"/${P}-db4-bdbobj_configure.ac.patch\
+               epatch \
+                       "${FILESDIR}"/${P}-db4-bdbobj_configure.ac.patch \
                        "${FILESDIR}"/${P}-db4-configure.ac.patch
        fi
 
@@ -124,25 +128,25 @@ src_compile() {
 
 src_install() {
        dodir /var/lib/${PN} /etc/pam.d
-       emake DESTDIR="${D}" install
-       rm -Rf "${D}/etc/pam.d"
+       default
+       rm -Rf "${D}/etc/pam.d" || die
 
        # Avoid name collisions in /usr/sbin wrt imapd and pop3d
-       cd "${D}/usr/sbin"
+       cd "${D}/usr/sbin" || die
        for name in imapd pop3d ; do
                mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
        done
 
        # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
        # 'Maildir', and to use /usr/sbin/courier-foo names.
-       cd "${D}/usr/$(get_libdir)/${PN}"
+       cd "${D}/usr/$(get_libdir)/${PN}" || die
        for service in {imapd,pop3d}{,-ssl} ; do
                sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
                sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
        done
 
        # Rename the config files correctly and add a value for ${MAILDIR} to them.
-       cd "${D}/etc/${PN}"
+       cd "${D}/etc/${PN}" || die
        for service in {imapd,pop3d}{,-ssl} ; do
                mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
                echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
@@ -157,28 +161,27 @@ src_install() {
                echo 'LOGINRUN=' >> "${service}"
        done
 
-       cd "${D}/usr/sbin"
+       cd "${D}/usr/sbin" || die
        for x in * ; do
                if [[ -L "${x}" ]] ; then
                        rm -f "${x}" || die "Failed to rm ${x}"
                fi
        done
 
-       cd ../share
-       mv -f * ../sbin
-       mv -f ../sbin/man .
-       cd ..
+       cd ../share || die
+       mv -f * ../sbin || die
+       mv -f ../sbin/man . || die
+       cd .. || die
 
        for x in mkimapdcert mkpop3dcert ; do
                mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
        done
 
-       exeinto /usr/sbin
-       doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+       dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
 
        dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
 
-       mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+       mkdir "${WORKDIR}/tmp" && cd "${WORKDIR}/tmp" || die
 
        for initd in courier-{imapd,pop3d}{,-ssl} ; do
                sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
@@ -199,7 +202,7 @@ src_install() {
        mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
 
        # Bug #45953, more docs.
-       cd "${S}"
+       cd "${S}" || die
        dohtml -r "${S}"/*
        dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
        docinto imap
diff --git a/net-mail/courier-imap/courier-imap-4.16.0.ebuild b/net-mail/courier-imap/courier-imap-4.16.0.ebuild
index 61dfe96c2f043463d84980602c4358a9b6aedbc7..e527f2445f13a727f869b2540d9683f0a399ad8e 100644 (file)
--- a/net-mail/courier-imap/courier-imap-4.16.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.16.0.ebuild
@@ -1,32 +1,35 @@
 # Copyright 1999-2015 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.16.0.ebuild,v 1.1 2015/02/09 17:01:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.16.0.ebuild,v 1.2 2015/03/21 21:35:09 jlec Exp $
 
 EAPI=5
-inherit autotools eutils multilib libtool systemd
 
-KEYWORDS="~amd64 ~hppa ~x86"
+inherit autotools eutils multilib libtool systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
+
 REQUIRED_USE="|| ( berkdb gdbm )"
 
-CDEPEND="gnutls? ( net-libs/gnutls )
-               !gnutls? ( >=dev-libs/openssl-0.9.6 )
-               >=net-libs/courier-authlib-0.61
-               >=net-libs/courier-unicode-1.1
-               >=net-mail/mailbase-0.00-r8
-               berkdb? ( sys-libs/db )
-               fam? ( virtual/fam )
-               gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+CDEPEND="
+       gnutls? ( net-libs/gnutls )
+       !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+       >=net-libs/courier-authlib-0.61
+       >=net-libs/courier-unicode-1.1
+       >=net-mail/mailbase-0.00-r8
+       berkdb? ( sys-libs/db:= )
+       fam? ( virtual/fam )
+       gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 DEPEND="${CDEPEND}
-               dev-lang/perl
-               !mail-mta/courier
-               userland_GNU? ( sys-process/procps )"
+       dev-lang/perl
+       !mail-mta/courier
+       userland_GNU? ( sys-process/procps )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-courier )"
 
@@ -53,7 +56,8 @@ src_prepare() {
        # These patches should fix problems detecting BerkeleyDB.
        # We now can compile with db4 support.
        if use berkdb ; then
-               epatch "${FILESDIR}"/${PN}-4.15-db4-bdbobj_configure.ac.patch\
+               epatch \
+                       "${FILESDIR}"/${PN}-4.15-db4-bdbobj_configure.ac.patch \
                        "${FILESDIR}"/${PN}-4.15-db4-configure.ac.patch
        fi
 
@@ -113,25 +117,25 @@ src_compile() {
 
 src_install() {
        dodir /var/lib/${PN} /etc/pam.d
-       emake DESTDIR="${D}" install
-       rm -Rf "${D}/etc/pam.d"
+       default
+       rm -Rf "${D}/etc/pam.d" || die
 
        # Avoid name collisions in /usr/sbin wrt imapd and pop3d
-       cd "${D}/usr/sbin"
+       cd "${D}/usr/sbin" || die
        for name in imapd pop3d ; do
                mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
        done
 
        # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
        # 'Maildir', and to use /usr/sbin/courier-foo names.
-       cd "${D}/usr/$(get_libdir)/${PN}"
+       cd "${D}/usr/$(get_libdir)/${PN}" || die
        for service in {imapd,pop3d}{,-ssl} ; do
                sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
                sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
        done
 
        # Rename the config files correctly and add a value for ${MAILDIR} to them.
-       cd "${D}/etc/${PN}"
+       cd "${D}/etc/${PN}" || die
        for service in {imapd,pop3d}{,-ssl} ; do
                mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
                echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
@@ -162,8 +166,7 @@ src_install() {
                mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
        done
 
-       exeinto /usr/sbin
-       doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+       dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
 
        dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
 
@@ -188,7 +191,7 @@ src_install() {
        mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
 
        # Bug #45953, more docs.
-       cd "${S}"
+       cd "${S}" || die
        dohtml -r "${S}"/*
        dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
        docinto imap
Unnamed repository; edit this file 'description' to name the repository.