mail-mta/opensmtpd: port to GLEP 81

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>

diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
index c5f91cb5029e24ae18e1cb32c9e2814b6714312c..bdc4021247d65a636431263ba64ffa396a38e3c3 100644 (file)
--- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
+inherit multilib flag-o-matic eutils pam toolchain-funcs autotools systemd
 
 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
 HOMEPAGE="https://www.opensmtpd.org"
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="libressl pam +mta"
 
-DEPEND="!libressl? ( dev-libs/openssl:0 )
+DEPEND="acct-user/smtpd
+               acct-user/smtpq
+               !libressl? ( dev-libs/openssl:0 )
                libressl? ( dev-libs/libressl )
                elibc_musl? ( sys-libs/fts-standalone )
                sys-libs/zlib
@@ -74,13 +76,6 @@ src_install() {
        fi
 }
 
-pkg_preinst() {
-       enewgroup smtpd 25
-       enewuser smtpd 25 -1 /var/empty smtpd
-       enewgroup smtpq 252
-       enewuser smtpq 252 -1 /var/empty smtpq
-}
-
 pkg_postinst() {
        einfo
        einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"

diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
index 001f39e82b74a0da44f283277ecce244ae8f01c8..0889df338c55a9a8bd2a206f7c224ec76ab44e7e 100644 (file)
--- a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
+inherit multilib flag-o-matic eutils pam toolchain-funcs autotools systemd
 
 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
 HOMEPAGE="https://www.opensmtpd.org"
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="libressl pam +mta"
 
-DEPEND="!libressl? ( dev-libs/openssl:0/1.1 )
+DEPEND="acct-user/smtpd
+               acct-user/smtpq
+               !libressl? ( dev-libs/openssl:0/1.1 )
                libressl? ( dev-libs/libressl )
                elibc_musl? ( sys-libs/fts-standalone )
                sys-libs/zlib
@@ -69,13 +71,6 @@ src_install() {
        fi
 }
 
-pkg_preinst() {
-       enewgroup smtpd 25
-       enewuser smtpd 25 -1 /var/empty smtpd
-       enewgroup smtpq 252
-       enewuser smtpq 252 -1 /var/empty smtpq
-}
-
 pkg_postinst() {
        einfo
        einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"