diff options
| author |   Rolf Eike Beer <eike@sf-mail.de> | 2019-09-26 22:26:32 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2019-09-28 09:46:15 +0300 |
| commit | 4a1b9aba414abe2f31da43724ba71f38e076dde0 (patch) | |
| tree | abb8ea7e242cf927babc19c412f4ca8d1c27dc79 /net-mail | |
| parent | acct-user/vpopmail: add new user (UID 89) (diff) | |
| download | gentoo-4a1b9aba414abe2f31da43724ba71f38e076dde0.tar.gz gentoo-4a1b9aba414abe2f31da43724ba71f38e076dde0.tar.bz2 gentoo-4a1b9aba414abe2f31da43724ba71f38e076dde0.zip | |
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@sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13049
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 25 |
1 files 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 4b291b713517..3cbfe467136a 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." } |