gentoo resync : 28.04.2019

3 files changed, 2 insertions, 49 deletions

diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index 4ff0647de72e..d0a6429c5ee0 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -10,6 +10,5 @@ AUX unchecked-encrypted.patch 2022 BLAKE2B fc09850f9b4aeeccb5047086ff32add53347c
 AUX unescaped-left-brace.patch 2043 BLAKE2B 4755ef33bbb8961fc69cee4276546724f1fb5e89b92107baa4b2a5a7f1c6b0f611bb24a5184c7657496784343f3b7639dcbe41bdc70d26de4343576c30bebceb SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745
 AUX will-bind-to-lines.patch 1077 BLAKE2B c96651f6a0b68a4b95eb571ecbe7a7002a20b765184d28ea21e32b96dcde67041bb03431674a9f51809a528f20e14e50337d2c1315a6e19f4bf5a2da5bcd11d4 SHA512 60a0844d7a6a17b7c79422e641660e20b69cf89844bcddf3356ff6a60b4c4ff2b2e90206248a5a5771e014edee2917eb47e83276a0e56aeb7f8dfd75d55190f4
 DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
-EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 BLAKE2B 24340243fd70ec8be31da53dead0e5de83faf88bbb2644bf17c063ee03e605cd009f7990bdd8479798c1959f1c58243de345bf52cf5007ba507f65aee0f3ff07 SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15
-EBUILD amavis-logwatch-1.51.03-r5.ebuild 1421 BLAKE2B 8eeb314a2c0ca87504eb495846b46c5d797fa244a05f86ecb2f579649548ba46bd510b55a65d2897dbaa18c1a7503721c14cadd4f9c3d61bd469734104738d45 SHA512 e6e02eb3a13025820714e78f312b5cdf4c19a94eeb537780cad04e0992e942b1d391832e1812fc0f468ca53b2b9792bedbf1a7dc4e3b7f1aa118c49799c7dc80
+EBUILD amavis-logwatch-1.51.03-r5.ebuild 1419 BLAKE2B 473dacf0d49b067d0a6354c7026f54c9d8d320997ef7f2abeb2b4ac6a42f992235b64b213322f2e28995a1f338b97550a617913f8d84e7542488b351fde689a5 SHA512 bc2bf187d2165207c5ac62964444dcbcc994101bce9baa50dfec1798750bfe53ba2b38c5ef1152950ab2ec4529d08a82665c76dccc4a8f1d0c20ec6c02352fcd
 MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
deleted file mode 100644
index 79d11a94ef74..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/unescaped-left-brace.patch"
-	"${FILESDIR}/redundant-argument-to-sprintf.patch"
-	"${FILESDIR}/ignore-amavis-startup-notifications.patch"
-	"${FILESDIR}/ignore-utf8smtp-lines.patch"
-	"${FILESDIR}/unchecked-encrypted.patch"
-	"${FILESDIR}/file-libmagic-errors.patch"
-)
-
-src_prepare() {
-	default
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
index c7c607e6427a..17b9ad2d5afe 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"