gentoo resync : 29.05.2018

4 files changed, 2 insertions, 99 deletions

diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index e2a0b97dac10..cdd93ab5f656 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,9 +1,5 @@
-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 1619 BLAKE2B a2365ea4db6e9881935455836728cb496fad5341895441278c22f45514738c73cc601f8ff043d6858e81e13949af026fbf28745a096e567e36ce2ac0aa1072ae SHA512 ab3c2b6ec40370585cdfba80d29743aab1d8899b4d0da82f134db9f5e72a504599cbef9c526aa16b1a07ec8392f829cf20b1745cd84610326f60a08f5d5f6813
-EBUILD mailx-8.1.2.20160123.ebuild 1254 BLAKE2B da2a38227d81628be9591b41b338f136c484bccbdbc80141b8309a5e2f1398eeaaf15b6e87652f601170b3638c3194ac757e47dea8721787a4d766a666976ae6 SHA512 ef33d5566cd54bdff85a352488882f8ca1783c3747262ba25564b80d8fb69f6be58dbb793ebad2cfa36b1e0da94bb7991e98b46cd06df4f77ccb0580ac7ac8df
+EBUILD mailx-8.1.2.20160123.ebuild 1252 BLAKE2B 3884b63d085bc014e7da3953dac3df9fc988e7b27e0b284b9fbc5b0aae5ed1711c24b148b0be689d9b74948c91d12ddb5901769d43ffe41878d312a616ce1413 SHA512 6ac946ffd4cf75f375c3127864f962fbf16e4beccae583a5ab663eb82fce768f9cd6f4811d6daee02c0f737b25b9066dc9083396946cfa3f4daf672616ebddcc
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
deleted file mode 100644
index 14a05ba4d6dc..000000000000
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mailx-8.1.2-0.20050715cvs.orig/Makefile
-===================================================================
---- mailx-8.1.2-0.20050715cvs.orig.orig/Makefile
-+++ mailx-8.1.2-0.20050715cvs.orig/Makefile
-@@ -3,16 +3,7 @@
- PROG=mail
- CC=gcc
- 
--CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT
--
--ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
--  CFLAGS += -O0
--else
--  CFLAGS += -O2
--endif
--ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
--  LDFLAGS += -s
--endif
-+CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT ${EXTRAFLAGS}
- 
- SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
- 	edit.c fio.c getname.c head.c v7.local.c lex.c list.c main.c names.c \
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
deleted file mode 100644
index c51ce8d07a7c..000000000000
--- a/mail-client/mailx/mailx-8.1.2.20050715-r6.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 eutils flag-o-matic toolchain-funcs
-
-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
-
-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}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=net-libs/liblockfile-1.03
-	virtual/mta
-	mail-client/mailx-support"
-
-RDEPEND="${DEPEND}
-	!mail-client/nail
-	!net-mail/mailutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}/${debian_patch}"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
-	epatch "${FILESDIR}/${P}-offsetof.patch"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dodir /usr/bin /bin /usr/share/man/man1 /etc
-
-	insinto /usr/bin
-	insopts -m 755
-	doins mail || die
-
-	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 || die
-	insinto /etc
-	insopts -m 644
-	doins misc/mail.rc || die
-
-	# compatibility link
-	dosym /usr/bin/mail /bin/mail || die
-}
-
-pkg_postinst() {
-	elog "mail command now lives in /usr/bin."
-	elog "Please adjust your scripts."
-}
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 5ab5c2a4012e..6776db8758c4 100644
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03