gentoo resync : 08.01.2021

3 files changed, 3 insertions, 62 deletions

diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 39dcb2da39a4..777e327a8c67 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,9 +1,6 @@
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
 AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
-DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
-DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
 DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
 DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
-EBUILD mailx-8.1.2.20160123.ebuild 1252 BLAKE2B c0dbe3c57cbe7c344f7516b84f9195534456269078403ffa7d7394b817bf0011f312ff4c198244f43af815d81a8486287358b430f606759442d6b3e9903e56f8 SHA512 00e923afa6639b52ba0e46c35a2e41d58f176718f7bd4bd0e24248758ebd8f85f42f8c8a7e5fe9b5ca75ddd162c86ac183d6a5882d1625203fde91150149719a
-EBUILD mailx-8.1.2.20180807.ebuild 1310 BLAKE2B ee892448256470594bf5a733e7d6ca372673684361e40a0d0060759343f7ced04102a5855c2e3dab270fd859ea0fb38c2bdb6a3b3bb9f7efc6c7f94e020f3b1c SHA512 0711668fe718bafa181270f143dee3c3845f96e9aa57f220ddfc86dc1b603b8eb63162a9d5a2296fb9049515a9de9d68ac6a48a10924a3ca4ca2a48bfbd683b4
+EBUILD mailx-8.1.2.20180807.ebuild 1292 BLAKE2B f558391789ed0468b4e5481668c359e10d2846cba9d7df4dba352c9ff57e21234e1d3f9809cce195ea2d86511dbb7d2f669c0db65ca8f837a944ff8c07508222 SHA512 8f3c58bd37f2bf33b6e8451397f33ce426fb53593b82362210a2977edcfd377ec4f035de3837b30f30f5a851477102edb496fa2af018f1ab0ed971526032cba1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
deleted file mode 100644
index d8196d2ee513..000000000000
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DP="bsd-${PN}_${PV%.*}-0.${PV##*.}cvs"
-DPT="${DP}.orig.tar.bz2"
-DPP="${DP}-4.debian.tar.xz"
-
-DESCRIPTION="The $ mail program, which is used to send mail via shell scripts"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
-	http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPP}"
-
-S="${WORKDIR}/${DP/_/-}.orig"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=net-libs/liblockfile-1.03
-	dev-libs/libbsd
-	virtual/mta
-	mail-client/mailx-support"
-
-RDEPEND="${DEPEND}
-	!mail-client/nail
-	!net-mail/mailutils"
-
-src_prepare() {
-	eapply "${WORKDIR}/debian/patches"
-	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin mail
-
-	doman mail.1
-
-	dosym mail /usr/bin/Mail
-	dosym mail /usr/bin/mailx
-	dosym mail.1 /usr/share/man/man1/Mail.1
-
-	insinto /usr/share/mailx/
-	doins misc/mail.help misc/mail.tildehelp
-	insinto /etc
-	doins misc/mail.rc
-}
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index ec21b85da17b..0dc175ca042d 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=net-libs/liblockfile-1.03
 	dev-libs/libbsd