gentoo resync : 04.01.2022

4 files changed, 37 insertions, 34 deletions

diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 34778deb5ab2..79176a104e9e 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -1,11 +1,11 @@
 AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e5d5a92e94aaba5a72482fbf9756bf0eb7ea3cb1ec899e3c71dbc7dc587352b56ef627d3c SHA512 748dcdd4da9deba0a5c0925b67d98bb0e46d3ef651bb97a4be2ac34a683a9090bd11e5e3c28b69d0309f806a4f60aa826e4d940e7549ac636196cd2ac4bbef2d
 AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
-AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8
 AUX mailcap-r2 1837 BLAKE2B ad868b4ba6b6cbf8dcc7be7b39d763cb7cdd37bd8453f2debda9ab2241f79074e2ffc4112b120027a07ed8c55e1e761b2ecb36436bf380996ea315cc611371c9 SHA512 4360ef0f1d25b6ffb616a957ee81a2b5e0f559dc2ed8a6e221d1122f4a447c90aca2ee83ca0dd4ce5a73b41493ff8cbbe710824c5b6808269d577904b8ab3e2c
+AUX mailcap-r3 1584 BLAKE2B eac2e35ea578079c4a67f71a690443d616f99d666dad12553ae2020fc0affcbc121529c62d9cad1419e42b5a9d95ec3166c3f71385b047827c97acc0cc81d460 SHA512 3be98f171d9b6d891a24cc759d595eb856e28bbe29a2578d409993a6dec33ffd369f1c40bdb143e3e0a3698d009b06d5a0a5d329563c886fc592d58d874eab35
 AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5
-EBUILD mailbase-1.5-r2.ebuild 937 BLAKE2B 2553e7a535cd094e18c1ef1ed0c18f4c6b4784c9475bc22e70a2681552802455a7004574bd248ca82a62ce621a9ef5318898b343c728ad661303da32e1f91d50 SHA512 610e9c74fee61aa2e1b3275872c062f5a747344ad1f46fbcbb9b9f34120f3ce73b356821330da085d395b40ad24cf9ce1887d3499c40b45b94359ccf8b0bf3f6
 EBUILD mailbase-1.6-r1.ebuild 1059 BLAKE2B 8174de2a008b54e42045ffbabecb283875125f271748bc9e6c160a892cac4f09d421cc849d75a9a342057a52d45a02fcc29d697dfca5c0952a24eeb5b1ddf14e SHA512 0e0dc53abddd1b8b62237c17586a69ecb146b082348a5eca795e8ae70763558526cf4ad471166b725c99d7630629c357fe973b3ea1aab8fd05423a8cc56213f5
 EBUILD mailbase-1.7.ebuild 1059 BLAKE2B c963beb8507184a99f701c99c315071991a9560ce604af77eb147ac93cf399dfff013d6247ee80387016a615174b5bf039f24bd07d34cfdcc37068af225ef5a6 SHA512 a629e0333d6fdba2fc5add0bb690f00eeff8f776ac9f780b82ee05602bc049746472e77355b6939746a09e0c620be790f97021fe3acc80f8e1d0b9f799c3fe46
+EBUILD mailbase-1.8.ebuild 1010 BLAKE2B e429ee6de1eb2357d4a2d426890a38959f798a72045e3c17010dba48ff3932d7d23b398192c81ff92e4b28d3c205a637ad6b752e67c16a24cfc88bfe605a0e8e SHA512 afa1c8f727cb5dba7c999abd77a34e29b09fd7dfe6985569f31df25c3ccb9d4b0239290b83a81cc07979b42816881eb3b5a06625f920942c68cf4c574a550dfa
 MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/net-mail/mailbase/files/mailcap b/net-mail/mailbase/files/mailcap
deleted file mode 100644
index 7c42a55cf635..000000000000
--- a/net-mail/mailbase/files/mailcap
+++ /dev/null
@@ -1,25 +0,0 @@
-
-text/plain; less '%s'; needsterminal
-application/x-troff-man; /usr/bin/nroff -mandoc -Tlatin1; copiousoutput; print=/usr/bin/nroff -mandoc -Tlatin1 | print text/plain:-
-text/plain; shownonascii iso-8859-1 '%s'; description="Plain ASCII Text"; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-text/richtext; shownonascii iso-8859-1 -e richtext -p '%s'; description="Richtext"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-text/enriched; shownonascii iso-8859-1 -e richtext -e -p '%s'; description="Enriched Text"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
-message/partial; showpartial '%s' %{id} %{number} %{total}; description="An incomplete message"
-message/external-body; showexternal '%s' %{access-type} %{name} %{site} %{directory} %{mode} %{server}; needsterminal; description="A reference to data stored in an external location"; composetyped="extcompose '%s"'
-audio/basic; /usr/lib/mime/playaudio '%s'; description=Basic uLaw Audio; nametemplate=%s.au
-application/x-tar; /bin/tar tvf -; print=/bin/tar tvf - | print text/plain:-; copiousoutput
-application/x-gtar; /bin/tar tvzf -; print=/bin/tar tvzf - | print text/plain:-; copiousoutput
-text/plain; more '%s'; needsterminal
-application/xrx; view=xrx '%s'; description="remote X application"; test=test "$DISPLAY"; nametemplate=%s.rx
-text/richtext; richtext '%s'; description="Richtext"; copiousoutput
-text/enriched; richtext -e '%s'; description="Enriched Text"; copiousoutput
-text/plain; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
-text/plain; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
-text/html; /usr/bin/lynx -force_html '%s'; needsterminal; description=HTML Text; nametemplate=%s.html
-text/*; less '%s'; needsterminal
-text/html; /usr/bin/lynx -dump -force_html '%s'; copiousoutput; description=HTML Text; nametemplate=%s.html
-text/*; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
-text/*; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
-text/*; more '%s'; needsterminal
-*/*; less '%s'; needsterminal
-*/*; false; print=lpr '%s'
diff --git a/net-mail/mailbase/files/mailcap-r3 b/net-mail/mailbase/files/mailcap-r3
new file mode 100644
index 000000000000..fe717f34e0b0
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r3
@@ -0,0 +1,30 @@
+# Database binding MIME types to programs that can process them.
+# This file is generally used by mail clients to view attachments.
+#
+# Users should add their own rules to their ~/.mailcap file.  That file will be
+# processed first before falling back to this one.
+#
+# For more information, see the mailcap(5) man page.
+
+# NB: Do not quote %s.  Clients will handle expanding it with proper quoting,
+# so adding quotes ourselves just confuses things.
+
+application/pdf; xdg-open %s; needsterminal
+application/postscript; xdg-open %s; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
+# format doesn't support that, and less has good fallbacks already.
+application/*; less %s; copiousoutput; needsterminal
+
+audio/*; xdg-open %s; needsterminal
+image/*; xdg-open %s; needsterminal
+
+text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l %s; needsterminal; description=Man page
+text/*; less %s; needsterminal
+text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
+text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
+text/*; more %s; needsterminal
diff --git a/net-mail/mailbase/mailbase-1.5-r2.ebuild b/net-mail/mailbase/mailbase-1.8.ebuild
index 5cc221243da2..699bdc713711 100644
--- a/net-mail/mailbase/mailbase-1.5-r2.ebuild
+++ b/net-mail/mailbase/mailbase-1.8.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
+
 inherit pam
 
 DESCRIPTION="MTA layout package"
-SRC_URI=""
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pam"
 
 RDEPEND="
@@ -18,16 +18,15 @@ RDEPEND="
 	acct-user/mail
 	acct-user/postmaster
 	pam? ( sys-libs/pam )
-	!<net-mail/metamail-2.7.53.3-r2"
+"
 
 S=${WORKDIR}
 
 src_install() {
-	dodir /etc/mail
 	insinto /etc/mail
 	doins "${FILESDIR}"/aliases
 	insinto /etc
-	doins "${FILESDIR}"/mailcap
+	newins "${FILESDIR}"/mailcap-r3 mailcap
 	doman "${FILESDIR}"/mailcap.5
 
 	dosym spool/mail /var/mail
@@ -35,7 +34,6 @@ src_install() {
 	if use pam ; then
 		newpamd "${FILESDIR}"/common-pamd-include pop
 		newpamd "${FILESDIR}"/common-pamd-include imap
-
 		local p
 		for p in pop3 pop3s pops ; do
 			dosym pop /etc/pam.d/${p}