gentoo resync : 13.10.2019

3 files changed, 3 insertions, 43 deletions

diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index a2337bf05578..209ef500298f 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,4 +1,3 @@
 DIST esmtp-1.2.tar.bz2 127921 BLAKE2B 09823dace39d3fa7d525b85e33e6e64497ef81a6e2b4b1f3682e0576511b845c7cdf50602d6b1acd6d777ca34581d3727a337ff8cb7e737f278983c06fc8773c SHA512 a1e7b56743ba32b1778bf02d0abcbdb5e6e3cb7d592c3a23a575789de60dfd62a307d4aef06860c9553cc492cdde0fff0a42de53e9d4e972587a10f609be4821
-EBUILD esmtp-1.2-r1.ebuild 957 BLAKE2B 645d07c7754b9d8d8e38b25cb73248deed84d8acb05be3bdc9c7b5a1f8f04ac320df7109d25f8745e1e57a33ed944c2b149006cd04620f80d258b651f748f8b7 SHA512 8f50a3516913e2a02535673490b105d9025d53c3b65dd8be25635d9485d0822a62f3d034ba6a71d02474c12750a2d12cccfc7bf1a8b41fe28f401b06ea11d553
-EBUILD esmtp-1.2.ebuild 945 BLAKE2B 71b5c373d09181fb49be459ba3c4fd156a792acf64aad62dc6e49c15229a40917ea4d77ee519066d13edb199be59b72acac1e44e14b3d0e226b31569bc2abe35 SHA512 fdfe550797f7381f2b76c382cf5f67c8b5e41402162772f1153cf44eaf08486f0dbe2ccbf668026e6bb692fd6752533f78dc3d559d1ce1ac9af17f3654b0ce48
+EBUILD esmtp-1.2-r1.ebuild 951 BLAKE2B da36778e6a7a8d7aef07e40b1c531417b6d407a1436fbd26f3339395de9af49bcb1396fdc071bd68b31f5c5a33670e0bb61aefe0e38544d550587af6dcf46ac1 SHA512 a838bcc48a221f4690bb237c192f90f90d717b23ab11c768791870e1c2983e85b339527b5154cf291027456e665743d1685e4ef9fa6d6a2973ab6ccac583368a
 MISC metadata.xml 242 BLAKE2B 041399005c131e6e66967025968669f0ddb0972aa213f52e81852518a0005b7c478debfb6bc182443bb6a35066ebd6d3049c99d7b8e4a6272fd95960504e4d74 SHA512 8d906d3c3f37a584908f69913417a2c54ef0cde2709d7f2f88d25b932bfa18f98014a34f83d9ebd73f0508e324747ee48f412d909a0423892069fa9f03b78f37
diff --git a/mail-mta/esmtp/esmtp-1.2-r1.ebuild b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
index bd1d86f7997a..8830d7452eb1 100644
--- a/mail-mta/esmtp/esmtp-1.2-r1.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="libressl"
 
 CDEPEND="
diff --git a/mail-mta/esmtp/esmtp-1.2.ebuild b/mail-mta/esmtp/esmtp-1.2.ebuild
deleted file mode 100644
index 1f7558db2634..000000000000
--- a/mail-mta/esmtp/esmtp-1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="User configurable relay-only Mail Transfer Agent with a sendmail-like syntax"
-HOMEPAGE="http://esmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="net-libs/libesmtp
-	dev-libs/openssl
-	sys-devel/flex"
-RDEPEND="net-libs/libesmtp
-	dev-libs/openssl
-	!mail-mta/courier
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO sample.esmtprc || die
-}
-
-pkg_postinst() {
-	elog "A sample esmtprc file has been installed in /usr/share/doc/${P}"
-}