4 files changed, 16 insertions, 36 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 8e59d1360d89..a47bf7becc30 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 9cc6c0ce06ee..71e18a36f34c 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,8 +1,9 @@
-AUX mailx-8.1.2.20050715-musl.patch 527 BLAKE2B 4640b8833b4c624277eb4262d32942e1b586c5b96e6946af834d7472d56546051bc794c73819442b47b08854dcc6d01913b3505316e2f1e9464552486cbc65de SHA512 58896bfdcb7a358dd92fa57e1b67ec79a950a2c852a189bc073e47c2c166a5f4f5b56e77899752e3c670f7605af38a51ed890cb93dbb6dac68eb221528fc6ff4
 AUX mailx-8.1.2.20050715-nostrip.patch 668 BLAKE2B 593d7a7764d5e0c37ca565aeb88b579f7b8986c3a81fadbdb8a16c9ad53c36ea0065ec7fb31d43bb345f6901f1d04a7b2ab63b72d5fe48e45891f378fb12e9e0 SHA512 abdf016ed925c8f8388eb03cba64a601b2b72e3c53fcdadefa5c220bf7008325f38004d1ed3fe0a938ea82f8a9167352c235ff2536c7b5b100f63ac36f25db2c
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
+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 mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 BLAKE2B 825e4a62fa2d33e29c25092ec466e07be6be2abed0f1da5623f37be179cbb1212baade400a621fa838eced88a84393078c67c3126774ff08030680f4f0dbdd54 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe
 DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 BLAKE2B 0b0b9f4db18bda8b6572c97c33784f7e29c16d500b3658b79f31fb80947035e2bfc7eaf6e8bc50e621ee13ae5e61d7760aa882c29f0b082ce8974f7b1aa8416f SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68
 EBUILD mailx-8.1.2.20050715-r6.ebuild 1611 BLAKE2B b0ee36ea309f4aa4cf1f691f931e3bc303e0d15425425fa439d3b8101b74e27c09b21130062dd582cd0b2fb9b288d3b971c4cbff4703a7400d4b1cbb77331dd8 SHA512 08097bbdade032ffd4ec92527b56ff4aaaaf356e7c6ea990fca3a8210567abf9f5e0c31c46beaf9fb803306fd83642b600a0dc16ef80b4f6bca7ff59eb9cb711
-EBUILD mailx-8.1.2.20050715-r7.ebuild 1349 BLAKE2B 4056ba4e0f9706c485caba2151b85ceb84869fe985d1aad781c3f272eb7023ef0d91d5bc3de52f965a84bb6eb5d3743639063146fb4d6ebced728e8e1c1e8541 SHA512 76bdc8b2e5142837f066ba8d3677cadc067f0985de9c76c5609fd2a9961626640131fbb9b0b7faee61bfc09805135f6403ce5a6f51a92652f46cc31d01359e76
+EBUILD mailx-8.1.2.20160123.ebuild 1261 BLAKE2B 43545135c1abff906c7cfc03776c727b8bd5e368a3d2f66e4800e817ffc87e85e003036c3c991b72de491f06e3cefed6b6b79a01bca7d4fb01bbe70289b4af2a SHA512 255bacf6ed74c910b7e206af1b93b60f6fdefa290a3abff713e7e312eb22ca00f627d97eb3c2f9981ebc468c2904116e80831a8f2a215693fa75adb81d17c0b5
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
deleted file mode 100644
index a2e03ec9753f..000000000000
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
-+++ b/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
-@@ -70,9 +70,6 @@
-  */
- #define	UNVIS_END	1	/* no more characters */
- 
--#include <sys/cdefs.h>
--
--__BEGIN_DECLS
- char	*vis(char *, int, int, int);
- int	strvis(char *, const char *, int);
- int	strnvis(char *, const char *, size_t, int)
-@@ -84,6 +81,4 @@ int	unvis(char *, char, int *, int);
- ssize_t strnunvis(char *, const char *, size_t)
- /*		__attribute__ ((__bounded__(__string__,1,3)))*/;
- 
--__END_DECLS
--
- #endif /* !_VIS_H_ */
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 073036d05b61..22d1c99a2fe5 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils
 
-MX_MAJ_VER=${PV%.*}
-MX_MIN_VER=${PV##*.}
-MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
-S=${WORKDIR}/${PN}-${MY_PV}.orig
-debian_patch=${PN}_${MY_PV}-1.diff.gz
+DP="bsd-${PN}_${PV%.*}-0.${PV##*.}cvs"
+DPT="${DP}.orig.tar.bz2"
+DPP="${DP}-4.debian.tar.xz"
 
-DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
-	mirror://gentoo/${debian_patch}"
+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"
@@ -22,6 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
+	dev-libs/libbsd
 	virtual/mta
 	mail-client/mailx-support"
 
@@ -30,11 +31,8 @@ RDEPEND="${DEPEND}
 	!net-mail/mailutils"
 
 src_prepare() {
-	epatch "${DISTDIR}/${debian_patch}"
-	epatch "${FILESDIR}/${P}-musl.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile || die
-	epatch "${FILESDIR}/${P}-offsetof.patch"
+	eapply "${WORKDIR}/debian/patches"
+	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
 	eapply_user
 }