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

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

[Joonas Niilola]

commit:     9dbfc4954b1411a5bf25a7e1456e42cb76631892
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Sep 24 15:30:34 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 15:59:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbfc495

acct-group/vpopmail: add new group (GID 89)

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 acct-group/vpopmail/metadata.xml            | 12 ++++++++++++
 acct-group/vpopmail/vpopmail-0.ebuild       |  8 ++++++++
 net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild |  5 +++--
 net-mail/vpopmail/vpopmail-5.4.33.ebuild    |  5 +++--
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/acct-group/vpopmail/metadata.xml b/acct-group/vpopmail/metadata.xml
new file mode 100644
index 00000000000..984c50fcb5c
--- /dev/null
+++ b/acct-group/vpopmail/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>eike@sf-mail.de</email>
+		<name>Rolf Eike Beer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/acct-group/vpopmail/vpopmail-0.ebuild b/acct-group/vpopmail/vpopmail-0.ebuild
new file mode 100644
index 00000000000..fed48eea304
--- /dev/null
+++ b/acct-group/vpopmail/vpopmail-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=89

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
index 9aec8fe2f04..eca83681371 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
@@ -15,7 +15,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 
-DEPEND="virtual/qmail
+DEPEND="
+	acct-group/vpopmail
+	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:=[server] )
@@ -88,7 +90,6 @@ vpopmail_set_homedir() {
 }
 
 pkg_setup() {
-	enewgroup vpopmail 89
 	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
 	upgradewarning
 }

diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index bfc60278c20..e91114dbf41 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql spamassassin"
 
-DEPEND="virtual/qmail
+DEPEND="
+	acct-group/vpopmail
+	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( virtual/mysql )
 	spamassassin? ( mail-filter/spamassassin )"
@@ -36,7 +38,6 @@ vpopmail_set_homedir() {
 }
 
 pkg_setup() {
-	enewgroup vpopmail 89
 	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
 	upgradewarning
 }