[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/

[Benda XU]

commit:     179ca943ee6bc3a75b5443f8740b8cd6f1cc3ee3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 04:09:15 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 04:10:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179ca943

mail-mta/nullmailer: Prefix support.

Bug: 585882

Package-Manager: portage-2.2.28

 mail-mta/nullmailer/nullmailer-2.0.ebuild | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/mail-mta/nullmailer/nullmailer-2.0.ebuild 
b/mail-mta/nullmailer/nullmailer-2.0.ebuild
index c8efc5a..f3771bb 100644
--- a/mail-mta/nullmailer/nullmailer-2.0.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.0.ebuild
@@ -59,7 +59,7 @@ src_configure() {
        # https://github.com/bruceg/nullmailer/pull/31/commits
        append-lfs-flags #471102
        econf \
-               --localstatedir=/var \
+               --localstatedir="${EPREFIX}"/var \
                $(use_enable ssl tls)
 }
 
@@ -99,20 +99,20 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then
-               mkfifo "${ROOT}"/var/spool/nullmailer/trigger || die
+       if [ ! -e ${EROOT}var/spool/nullmailer/trigger ]; then
+               mkfifo "${EROOT}"var/spool/nullmailer/trigger || die
        fi
        chown nullmail:nullmail \
-               "${ROOT}"/var/log/nullmailer \
-               "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die
+               "${EROOT}"var/log/nullmailer \
+               "${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die
        chmod 770 \
-               "${ROOT}"/var/log/nullmailer \
-               "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die
-       chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die
+               "${EROOT}"var/log/nullmailer \
+               "${EROOT}"var/spool/nullmailer/{tmp,queue} || die
+       chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die
 
        # This contains passwords, so should be secure
-       chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die
-       chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die
+       chmod 0640 "${EROOT}"etc/nullmailer/remotes || die
+       chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die
 
        if [[ -z ${REPLACING_VERSIONS} ]]; then
                elog "To create an initial setup, please do:"
@@ -121,18 +121,18 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then
-               rm "${ROOT}"/var/spool/nullmailer/trigger || die
+       if [[ -e ${EROOT}var/spool/nullmailer/trigger ]]; then
+               rm "${EROOT}"var/spool/nullmailer/trigger || die
        fi
 }
 
 pkg_config() {
-       if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+       if [ ! -s ${EROOT}etc/nullmailer/me ]; then
                einfo "Setting /etc/nullmailer/me"
-               /bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+               hostname --fqdn > "${EROOT}"etc/nullmailer/me
        fi
-       if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+       if [ ! -s ${EROOT}etc/nullmailer/defaultdomain ]; then
                einfo "Setting /etc/nullmailer/defaultdomain"
-               /bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+               hostname --domain > "${EROOT}"etc/nullmailer/defaultdomain
        fi
 }