gentoo resync : 16.09.2020

3 files changed, 2 insertions, 45 deletions

diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index c177ccfc5212..fdb7e9eb17e5 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -1,10 +1,7 @@
 AUX efax-0.9a-fax-command.patch 229 BLAKE2B 393efd22712658af3e98fd08808e30c9c5f7f29f3526e12a5003b4c9f771a96e9f3e1640dfa8a42090dfc6ec013d224dbdf7cc2fbffdcf7a93b9729718539d88 SHA512 fabd2208d170369c6773ecf0248dda2b2585284d2fe776c49b1e08d5136a751ea0a11d53bdcd1313d5d673e829469f216e9bc96bdbe4db57152f422ee5f5b137
 AUX efax-0.9a-fno-common.patch 762 BLAKE2B 57c915976dd6437a9f4e420188ae28ed44dda6cabb91a86c0fe02670cf772f8511588a3bab8fa07cd3cec4a23aee660caa639eccf72cf6ca8e35f501878e1b94 SHA512 db1fd713c85e9c151252b8f47943123185981c250d8d018d4b8ba8086bec3497fe89abe9cdad539c61b42be9af7a0df7465dfdf637e98c9b02a86c382caef760
 AUX efax-0.9a-strip.patch 332 BLAKE2B 12f4313f6d0c9c5b88dc39eda399afbb7e5ec0d0e5b95114197757b091a1c635e086e2e1791cfde415e950c08f4e2eb6b020bb607750441c59e1a3ef7896e2d8 SHA512 02945f51850e90e70572402fd75cdedc3a213b4329c5277066f696153b773e9911b4d48c29f295c0f7c54dc3518e08b4b8a83f882f5ed604284cbb784ae42b13
-DIST efax-0.9a-001114.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b
 DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc
-DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735
 DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b
-EBUILD efax-0.9a-r4.ebuild 999 BLAKE2B a877183b0f65ef3c92d58c464caf046b55880b146c610c34bcfa9cf43f4551ce7188b8681e0ce26e060ba9a9f8c93bae3d0d2e60d0db8cd979e534d1b844594f SHA512 5a8fe1b68505af8798fd785704f26b6a73d261591b08298bf6adfaf2da2dd6bd6ce4c944b2090ce95227c746c50e443c32399ff6b349dde16cd24feac5bedb74
-EBUILD efax-0.9a_p19_p1.ebuild 1244 BLAKE2B ab11a208fc1782a873fb83a9b2bd609ed4212076ce1ed12b75337f05ece82254e5db02eb0bed0fa5b6ac600c4f0344802a50b3fe5f45759c430f4da1d48ed847 SHA512 6f7e6c3ec39d370d0c20b28629d119f8f302cf8c982b79bc5bef08a93a852a8b7c213710d32076852062ca13239f1dff888b4e74ca20f72ab2eb92269627dd7e
+EBUILD efax-0.9a_p19_p1.ebuild 1242 BLAKE2B 725c4d6ff515c68e3e0eb7fa821f9cbc2f670d9a8a92abb0a46a2cc37d51c752c3b74b018d6b84022d63b6e8f60ee68d072ebe7119d71cc0d99455bf93339ce3 SHA512 63f6e8e0a37ca602d22684c2a146e47422221ea66005e9c5382e2df6d7f74e45757168aa6f6818c3cff5cc9430827d848e070ebfdd426482eb74f63cb61047c0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/efax/efax-0.9a-r4.ebuild b/net-misc/efax/efax-0.9a-r4.ebuild
deleted file mode 100644
index ae3fd4c5975e..000000000000
--- a/net-misc/efax/efax-0.9a-r4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-S="${WORKDIR}/${P}-001114"
-
-DESCRIPTION="A simple fax program for single-user systems"
-HOMEPAGE="https://www.cce.com/efax/"
-SRC_URI="https://www.cce.com/efax/download/${P}-001114.tar.gz
-	mirror://debian/pool/main/e/efax/efax_0.9a-19.diff.gz"
-
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-src_prepare() {
-	epatch "${WORKDIR}/${PN}_${PV}-19.diff"
-	rm -f "${S}"/${P}/debian/patches/series "${S}"/${P}/debian/patches/00list
-	EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches/*
-
-	epatch "${FILESDIR}/${P}-fax-command.patch" #327737
-
-	# remove strip command as per bug #240932
-	sed -i -e '/strip/d' Makefile
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin efax efix fax
-	doman efax.1 efix.1
-	newman fax.1 efax-fax.1 # Don't collide with net-dialup/mgetty, bug #429808
-	dodoc README
-}
diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild
index f95c8c52897a..f15a6494aef2 100644
--- a/net-misc/efax/efax-0.9a_p19_p1.ebuild
+++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff.gz
 "
 
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 PATCHES=(