gentoo resync : 29.10.2017

3 files changed, 2 insertions, 39 deletions

diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index b8a5cd675aaa..ca8e0b9d28e3 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -5,8 +5,7 @@ AUX redundant-argument-to-sprintf.patch 1738 SHA256 6f7e911096abe09ccd88ed8fa326
 AUX unchecked-encrypted.patch 2022 SHA256 f6d4dba2dce5580f6ebbb6d0235b7841ea87b0105b3bbe1dc5740c4d4d8a2331 SHA512 6fc07898123012d2755851fa9a4ab026174fb82f1a85361ddc95f407c0f4ac9b1e8979215c1264c21775f997dff343f209676b6055728a52590b37d8e7e2f4ba WHIRLPOOL 9015a2527c6136731af83d0834f5ee8500ce6942d1965c30afc6d58b3afc517ebf6cbbbc51204ba8fa4d200502a15ce6642beb98dd15aacc919e11b87e7c8af7
 AUX unescaped-left-brace.patch 2043 SHA256 a1582521379af0bad46391de151fdf83144a67759ee32fe7cd1a8e2b9976359e SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745 WHIRLPOOL 3cf1e2bafe00846d35dd41f9e57f679efd207837591598e02cb2b1fc1f26e48a2d0fb426d3676edcd514595ee8d4287621e23ed88f9574072527d4de930298c0
 DIST amavis-logwatch-1.51.03.tgz 87304 SHA256 247f12646f834f6ed067d7aa79ef89f458284a6141391c3d96d6225bb1679c92 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 WHIRLPOOL 3da18a7eedad87b609cf3b8573d1bdfb4ee3561776a500f88b58e5576e33a3184cc1deec32a8d0b9252ac51d9e97ba74c5b223080e82f4fce38a156f3ac6df3c
-EBUILD amavis-logwatch-1.51.03-r3.ebuild 1193 SHA256 ba2c74784ea248442c9c2b3abb892f8c41b4ac107315d1c2bc21a964cdc843b7 SHA512 ea96a9ea428d6b260266b74c44ca7eec0f6a760739439c1d36e66bfe89e37201546930ce89296b1750f15f4f41a17e712061abf0b07b14f4459499976092fac0 WHIRLPOOL 1290875ed39d80db0f6dba81f84386e97846cbb7857b25b09b277d41f0912b96b9f85109a2a59965e39c0a3a97eaca46176d85f3659299bfa99f7554c91152fe
-EBUILD amavis-logwatch-1.51.03.ebuild 893 SHA256 101cddc25741f51005e02d08bd4f90d612787c46bad197554b917b619bb42904 SHA512 f665e621e964bd62b2f76d9b893b172818a3a8f709e2fda4072f1b7a0751f8e9c5a42f2416bb93e4def055091b397247c04aef5911906932f9f077b01e0c07a3 WHIRLPOOL 98bc365221e2c819677fa934a32367c28fc3bf2aff0411de6aa6891c0e0b39163ba9bcab983db04eadc029667d424ffbd5df01e11e6bb211a588c7e43b1574f5
+EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 SHA256 d1238973e4426a1074edfa4715b932efd34ee486618cf0a08224bdd56db006aa SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15 WHIRLPOOL 6cf71087f0f6ceacfc1bc249f2e1fe1094bdecc5bb532a0a5615300c8d5b5c9bb0afd8dc3f2788e3d6427fa45fcce21760def744c97cc97c11a92bcddf7a158d
 MISC ChangeLog 2204 SHA256 95cbfb16c6eebcef18a8559e6b16f61f69b57ba7c2e60ff0e1506374a0669336 SHA512 46e9fc2dc8ec7db7ca1ef4110857c0f042427c47edb4d6d5d7fca65e372f93bf1d841c0207e1cebd9827406032360694c82cf43157ccabbd66d6d27e261bb00c WHIRLPOOL 494bbb01369304c7a8f4abb7fb85938d5cba9f3c245c7cf1e012e182d577fa492639dbfd347f107219b0c1f9910701089536b8fb31ce944b4dceda07a54dfaaa
 MISC ChangeLog-2015 928 SHA256 c1e501d8ed1ecb5abf16abb6df2ea2bc326df14796d05423505b27530e8ad746 SHA512 c553a5750544c2006c8aea1c1d32b7df8e1d90b2096f5369b50e288e2bf56300a0ac82318eec3626db8226dca67c3a100081e1f690677df6a2e4a4ae1927ea22 WHIRLPOOL 61d96d5f0d4233414a70181629fdad2c1f82a3b9c347de7722392b73dfd17cb793dc83234fd3c007b22b9866d4246d337abd13850d7a27622a108cbf590ad005
 MISC metadata.xml 296 SHA256 9964c7a00fb143c08fd771f7d3601f658282cf28e5eecf249487c4b5f1e95b23 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720 WHIRLPOOL ce6b711172c28911c1b8a31a1d58eba66ca1ebdd5307efdfc3d5def0543de5d8c52830e7109252a91b1b425d7b385711972b4827693d9218f2dbb4d0891d1922
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
index e312caecfdf7..79d11a94ef74 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.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"
 
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
deleted file mode 100644
index f8eb3efd3b4f..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-
-src_prepare() {
-	# 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
-}