gentoo resync : 18.12.2017

7 files changed, 4 insertions, 80 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index adef1aaa637f..ae759ac9b70e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index 6d3385e4d2d7..6ac41c8ca813 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,4 +1,3 @@
 DIST eps-1.7.tar.gz 29913 BLAKE2B 83205ed03cd4d28538c356b3d905437179c961e8a3d60059a59cd32b16548a4cb9bd73382bd4a948fe4a985a5cc39a85ec84126df1a61799a6dcba3a6227ff66 SHA512 be7df0d5bce5798afda0573b5d943da7e69e6b99817f4ed6d87e2858e75d7c2408d7fa9942dfc6277db0bedb73cf1f5ca64542d070075dda544cbc695134b1a0
-EBUILD eps-1.7-r1.ebuild 810 BLAKE2B 47775395870c2eb2b72a65470fe0c9072dec39ee0ef284182b5fb795dda2a9f454a99bd6acaf6328d36e1bd2c0dd109994cad88b0703765ab4cc4dba296df3e7 SHA512 f1ac84f7fc4f411a8dd1155573c4c20c5cfe7772595b72b7753bfc6cba30254b5d71a92768a7d4dc7072d069c5b8edaa153958253ea7934c2fa3e58b4eccbc9d
-EBUILD eps-1.7.ebuild 858 BLAKE2B 85c7f24f6f99f607d6ac9bbe664eab653d294433163fd9db8776aa200488c967c04b2c5f0f39a3ddef999eab45381b2adc8100c4368f0f29836cb6bfeb6210a4 SHA512 2faabd69b0a6a53101201d1e20d83027b7550e19d968cb9a28407f8a1555a1f5692a8a4f5a3df72dea1fa0b4c84181b21e6f239ddefe952be243702be9aa56f8
+EBUILD eps-1.7-r1.ebuild 809 BLAKE2B 0b09b965c8d853375db7e6bfe9113665dd831db65fa4928ca045774577b2cb16ec0f6a3227097936e746af05ea3c94c032a9c50fcb870488720461ca0b42c7b3 SHA512 aa69fdadf60a454d7ddecb68cd8a290842e87d8f8bb5b1f5f9a821abab5b262e9e1afe80cffab5a75ea3cbcb7b223e371768c976b2897aef372e705243a582e9
 MISC metadata.xml 524 BLAKE2B 559a2dc92cb88aa4b3224bfff8ef871f20ae2c323da8a736f57c5f2de4dc7fb506b8d57f6419562120921573d9bbc9abbe3b8b9dd209e42a0d1c95aa6850e99f SHA512 a1432bfc8582f30d2a012452dbc686b10524abff01dba3aaef5a591eff74e3b3b0eddbe10a6c897dfd7e116fcd73c925bda598d81f7c37affc0444d0c9754ae8
diff --git a/net-mail/eps/eps-1.7-r1.ebuild b/net-mail/eps/eps-1.7-r1.ebuild
index 74a62e1dc09d..92434d568c07 100644
--- a/net-mail/eps/eps-1.7-r1.ebuild
+++ b/net-mail/eps/eps-1.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/net-mail/eps/eps-1.7.ebuild b/net-mail/eps/eps-1.7.ebuild
deleted file mode 100644
index c938746bdb4e..000000000000
--- a/net-mail/eps/eps-1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Inter7 Email Processing and mht System library"
-HOMEPAGE="http://www.inter7.com/eps"
-SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_prepare() {
-	sed -i -e 's:/usr:$(DESTDIR)$(prefix):g' \
-		-e 's:\(DEFS.*\):\1 $(CFLAGS):' \
-		-e 's:$(DEFS):$(DEFS) -fPIC:' \
-		-e 's:-shared:-shared -Wl,-soname,libeps.so $(LDFLAGS):' \
-		-e 's:cp -pf:cp -f:g' \
-		Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
-	emake prefix=/usr DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
-		|| die "emake install failed"
-	dodoc ChangeLog TODO doc/*
-}
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index 8b7a8b33fb5a..22aeab862a07 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -7,6 +7,5 @@ AUX mpack-1.6-munpack.patch 1341 BLAKE2B 9c1a41f1d1e6db8b80369818effc56556d1c2b7
 AUX mpack-1.6-paths.patch 2729 BLAKE2B aa0cf351e69b2b041ea14c84c651275cf6e2cc8953d18363e7e9fe58c1d8a54aef0ff028ddfe47452dafb2c2c9c4af37d104f5f8a58f6fef106197bfaa1500ca SHA512 918a1f25e5f224d34f2e1b44aae7683b5d31b384d6e124de88c1fe661e42ef5d88810d7380bc4e298a2d7efe152f0da5cfc3b3028c65a3f2a337511d3384fcf7
 AUX mpack-1.6-usage.patch 721 BLAKE2B 9631aed898a8f95fb3e70f29c82994d0f1abcb935c106074c014a56f59f39df46fe6aea5b9eef0e58bfb25d5c9d4084126b88eb1117d8ca124746058b334bc52 SHA512 e07f72e6a0d037f788829904050bbee9f1c8c722a6b363b8a95ab012dda99b952e36bd7a9772a63d22ff4da34fdd44ead8d42db510e8c340f3410b3cd0d52b1a
 DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714
-EBUILD mpack-1.6-r3.ebuild 891 BLAKE2B 42c358a123a01551adec605843e710ac1400b5155e5a34ceae3d870b214401020f943725297740b13479321d6648f9beb1083b0a09403f32b3f1bff15e9372fc SHA512 30e892df7523284b1b800b36608b404a41e0aeff496dbd2fbdb7a638de0be52214a00e9be1a0256e877527fd3ba63d296f4968a7033445136abbaf647f310970
-EBUILD mpack-1.6-r4.ebuild 846 BLAKE2B 0cfb9102e5aa94508873eef7a14732719397cbf7c4cb595d5c157fb50cf96e57be1a059420f4389c07d2735cd05f5cbded62809d6919f48cf26fb64d3564d1ed SHA512 e0d38eaf8a94dd8dcb2b49c643f7ccedbad39e6360af325db8bb5536ac735e27f823e645d88fd5c1bd6e7ed41cd6f709d7970a80582c0191d4ee84d066e2f84f
+EBUILD mpack-1.6-r4.ebuild 845 BLAKE2B 0e9f569170bfd111bc961e4b355ff26a16fbf0e2b854ea20e3f2910b79e5646e9afdfe6209fc258b9f159b59548c91dc6a8fcccd2d4f4cc88b86bf63f3128b60 SHA512 9d5ee1be67c280dd97ef38e8b48686b3a633c4dd740d8a64995708bc4e971dd428ea29034209d00bb47ae91faaa7add14128769021b3bab6b19bc6a0d447590d
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mpack/mpack-1.6-r3.ebuild b/net-mail/mpack/mpack-1.6-r3.ebuild
deleted file mode 100644
index 5016cc6747d0..000000000000
--- a/net-mail/mpack/mpack-1.6-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-AT_M4DIR=cmulocal
-
-inherit eutils autotools
-
-DESCRIPTION="Command-line MIME encoding and decoding utilities"
-HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="HPND"
-KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-filenames.patch
-	epatch "${FILESDIR}"/${P}-usage.patch
-	epatch "${FILESDIR}"/${P}-munpack.patch
-
-	# NOTE: These three patches replace <mpack-1.6-gentoo.patch>
-	epatch "${FILESDIR}"/${P}-compile.patch
-	epatch "${FILESDIR}"/${P}-paths.patch
-	epatch "${FILESDIR}"/${P}-cve-2011-4919.patch
-
-	epatch "${FILESDIR}"/${P}-clang.patch
-
-	eautoreconf
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dodoc README.* Changes
-}
diff --git a/net-mail/mpack/mpack-1.6-r4.ebuild b/net-mail/mpack/mpack-1.6-r4.ebuild
index 8137988a7aa2..d3411787bb6c 100644
--- a/net-mail/mpack/mpack-1.6-r4.ebuild
+++ b/net-mail/mpack/mpack-1.6-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="HPND"
-KEYWORDS="~amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-filenames.patch