[gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/

[Joonas Niilola]

commit:     4a1b9aba414abe2f31da43724ba71f38e076dde0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Sep 26 20:26:32 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 06:46:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1b9aba

net-mail/vpopmail: use acct-user/vpopmail

Since this introduces a change if the user actually changed the home directory
of that user in an older version it is only used in the most recent ebuild.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13049
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild 
b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index 4b291b71351..3cbfe467136 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fixheadtails qmail user
+inherit autotools eutils fixheadtails qmail
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail";
 DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
@@ -38,6 +38,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-5.4.33-unistd.patch
 )
 DOCS=(
+       ChangeLog
        doc/.
 )
 HTML_DOCS=(
@@ -45,23 +46,9 @@ HTML_DOCS=(
        man_html/.
 )
 
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-       VPOP_HOME=$(egethome vpopmail)
-       if [[ -z "${VPOP_HOME}" ]]; then
-               eerror "vpopmail's home directory is null in passwd data!"
-               eerror "You probably want to check that out."
-               eerror "Continuing with default."
-               VPOP_HOME="${VPOP_DEFAULT_HOME}"
-       else
-               einfo "Setting VPOP_HOME to: $VPOP_HOME"
-       fi
-}
+VPOP_HOME="/var/vpopmail"
 
 pkg_setup() {
-       enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
        upgradewarning
 }
 
@@ -96,8 +83,6 @@ src_prepare() {
 }
 
 src_configure() {
-       vpopmail_set_homedir
-
        local authopts
        if use mysql; then
                incdir=$(mysql_config --variable=pkgincludedir || die)
@@ -148,8 +133,6 @@ src_configure() {
 }
 
 src_install() {
-       vpopmail_set_homedir
-
        emake DESTDIR="${D}" install
        keepdir "${VPOP_HOME}"/domains
 
@@ -229,8 +212,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       vpopmail_set_homedir
-
        elog "The vpopmail DATA will NOT be removed automatically."
        elog "You can delete them manually by removing the ${VPOP_HOME} 
directory."
 }