gentoo resync : 13.10.2019

6 files changed, 3 insertions, 278 deletions

diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index dc22a83471d6..eb337735fe82 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,9 +3,5 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.1.ebuild 1657 BLAKE2B ae93c9819b1e5bb8f8ede43955453d2f6aa68a306ebce97b611bb1b37abcbb12fe390c20a4db2c997f860c0b2b0db251052b12d6073e70c3ee1e40b7361139b5 SHA512 998ad423d34728fd24d0ff04d014568eba456775deedb1551e9c8e05a5993235347b0235975599e330e0545a84d8857ac84ce160fedc3bbb8d8062b908026932
-EBUILD mailbase-1.3.ebuild 1458 BLAKE2B 835a54fe1e299fd10342d6d890ef3436b91483a9e12cfc74d4291939c0a8bb1702f9467b9b9f0687a748915fdc3bdccefedaace530d96cb4d37108a474db3e7a SHA512 60cbbe72959a4b0f7f05080765257cdc18bde09c5444acf97d19b4bfbbe70eec3b6e110cbefc382db74d1506f551d9d5e919e8b927465c70fd6ac8a951eaaeb3
-EBUILD mailbase-1.4.ebuild 1482 BLAKE2B 81ae7a20ec4a3ae0e03d6b7ac1600f12784cbe8af947a3e4817d3f81319b3ab613f9838a3be1b5434da4824f7e334ca6929308e7cf71d54ec60be258b97b6f49 SHA512 024719cd733dbad2dd718367255d36688c3ca9c071807d8f2d13c6879d5539a456b64f11842fb73dd5236bc36bc7f0b41135cc1237d2d2037de2d761763a3565
-EBUILD mailbase-1.5-r1.ebuild 917 BLAKE2B a5e6583ba63d42c4abdb11d842763f0901f0711aa89918545e2b1bf78d456e7fe174e7be4015444fc925a17142affc040405b1c1759d3430a185f6d7ba97b11d SHA512 6da0509c46c811577d842b7a6ceac586cf77e5e94c3ffc31f8364a76b541d8108dbf3b5e697f8dd97b738e06e778aec77c0b6a3f7bbd45545a4f3f0f65113521
-EBUILD mailbase-1.5.ebuild 1482 BLAKE2B 4862a2824fb0c7f56ca4a0c7c443c0dfeb46824bd82fe144233efa397173d8620ba53d8ee9ba97d92bd7d368b694fec8645cd37d5216b6f707286595a35229d2 SHA512 001c7732c000d60fa3c336a1b57dc973c650814b6dba511d520d1977d67e9dc1f938d6d7c186109c8dd2f0dbe39bb541ab4a41ddc1e435e85ec88ef883ce1a46
+EBUILD mailbase-1.5-r1.ebuild 884 BLAKE2B 0b8ca2501fe7f11f9112299804d7ed47bc895c4fa9eb9cfa27685c72a1a883b8e8d0d3f8af3f49283beadb1f638abc461b969168d3e35dbfa31721e837f4f203 SHA512 dbdd0888d7bfaf472f44044510bca8659ebbc3e33b68aaf50aab47b8cc9a6c54aca3701423a9b084a63d7b2c08a231667f3765ceada635e1ac377e06242a5366
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.1.ebuild b/net-mail/mailbase/mailbase-1.1.ebuild
deleted file mode 100644
index 89b5f81ff118..000000000000
--- a/net-mail/mailbase/mailbase-1.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases || die
-	insinto /etc
-	doins "${FILESDIR}"/mailcap || die
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 03775 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p} || die
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p} || die
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
-		echo
-		ewarn "Your ${ROOT}var/spool/mail/ directory permissions differ from"
-		ewarn "  those which mailbase wants to set it to (03775)."
-		ewarn "  If you did not change them on purpose, consider running:"
-		ewarn
-		ewarn "    chown root:mail ${ROOT}var/spool/mail/"
-		ewarn "    chmod 03775 ${ROOT}var/spool/mail/"
-		echo
-	fi
-}
diff --git a/net-mail/mailbase/mailbase-1.3.ebuild b/net-mail/mailbase/mailbase-1.3.ebuild
deleted file mode 100644
index 6a3ab7e4c86d..000000000000
--- a/net-mail/mailbase/mailbase-1.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit pam eutils user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases
-	insinto /etc
-	doins "${FILESDIR}"/mailcap
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 03775 /var/spool/mail
-	dosym spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p}
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p}
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	# bug 614396
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
-		einfo  "Fixing ${ROOT}var/spool/mail/ permissions"
-		chown root:mail "${ROOT}var/spool/mail/"
-		chmod 03775 "${ROOT}var/spool/mail/"
-	fi
-}
diff --git a/net-mail/mailbase/mailbase-1.4.ebuild b/net-mail/mailbase/mailbase-1.4.ebuild
deleted file mode 100644
index 30ec0e15153c..000000000000
--- a/net-mail/mailbase/mailbase-1.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit pam user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases
-	insinto /etc
-	doins "${FILESDIR}"/mailcap
-	doman "${FILESDIR}"/mailcap.5
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 03775 /var/spool/mail
-	dosym spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p}
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p}
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	# bug 614396
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
-		einfo  "Fixing ${ROOT}/var/spool/mail/ permissions"
-		chown root:mail "${ROOT}/var/spool/mail/"
-		chmod 03775 "${ROOT}/var/spool/mail/"
-	fi
-}
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index 8a212cf0d798..e4aeaa32cbcb 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -10,14 +10,14 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
 RDEPEND="
 	acct-group/mail
 	acct-user/mail
 	acct-user/postmaster
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 S=${WORKDIR}
 
diff --git a/net-mail/mailbase/mailbase-1.5.ebuild b/net-mail/mailbase/mailbase-1.5.ebuild
deleted file mode 100644
index 898d804dc88a..000000000000
--- a/net-mail/mailbase/mailbase-1.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit pam user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases
-	insinto /etc
-	doins "${FILESDIR}"/mailcap
-	doman "${FILESDIR}"/mailcap.5
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 03775 /var/spool/mail
-	dosym spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p}
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p}
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	# bug 614396
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
-		einfo  "Fixing ${ROOT}/var/spool/mail/ permissions"
-		chown root:mail "${ROOT}/var/spool/mail/"
-		chmod 03775 "${ROOT}/var/spool/mail/"
-	fi
-}