Version bump. Remove old version and obsolete logwatch use flag.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

5 files changed, 65 insertions, 90 deletions

diff --git a/net-mail/amavis-logwatch/ChangeLog b/net-mail/amavis-logwatch/ChangeLog
index a8bb57bb2de2..e5811e3c22d4 100644
--- a/net-mail/amavis-logwatch/ChangeLog
+++ b/net-mail/amavis-logwatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/amavis-logwatch
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis-logwatch/ChangeLog,v 1.1 2013/12/20 00:31:31 mjo Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis-logwatch/ChangeLog,v 1.2 2014/09/05 21:39:21 mjo Exp $
+
+*amavis-logwatch-1.51.03 (05 Sep 2014)
+
+  05 Sep 2014; Michael Orlitzky <mjo@gentoo.org>
+  +amavis-logwatch-1.51.03.ebuild, -amavis-logwatch-1.51.02.ebuild,
+  metadata.xml:
+  Version bump. Remove old version and obsolete logwatch use flag.
 
 *amavis-logwatch-1.51.02 (20 Dec 2013)
 
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index 165522438c38..40498dd07ff5 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST amavis-logwatch-1.51.02.tgz 86314 SHA256 bdbb1c59d4ba08c1d8f2ff4a340d55f1063b4b7044158259cd7fc50cbde8b0fc SHA512 af1153dab6d01b47cd625358dead1ca3cd7b71aca00b43f65a822140b1dfdc9f5bb99d23a5908544f3ccd850a32e0d5600c87d1101b747ddf6600c67cae9019c WHIRLPOOL 2117bf9cc790a2c6bddf587b88f3275fb3f1204f6ec99db94228516becff639c8e720e8204773e4240f055a24cfbe7e9128c067bc52214a4b81ec368b760726e
-EBUILD amavis-logwatch-1.51.02.ebuild 1921 SHA256 c40412d7176131a647aebd7f00d91c7f40537a28b6db16e3f978498e10c38996 SHA512 27dbc139173b30c46b22ec5fe856a6038683e295ef50981d8a92bafbd2cea957816bbc964819be46bc5ed9da884a2577b32bab83b17a6c3d929d2822eb84bfba WHIRLPOOL d87fc88da11bc49fe5f359cc6d049fffc25df2d238746d5d122dfd6a4ecf99a4f27aab005eaee15d31bd69f94f12cbf1e6426033a77695f5c03fc621cfb4100d
-MISC ChangeLog 451 SHA256 f1921b48563a8ba017d87dc55e0d910657c250618551a153772fa47d143442bc SHA512 98cf4e238e7420304d43acbeab2461b50725d9b01838a35f5cd44b7d56b7fe4e178c16473f76fe77a73ded1b7b1852c9ecd34e5421e70b795f236c9fea017266 WHIRLPOOL 06b8d6722e87523c8c6d5722af9495509c07fe2b38e4e78696d52efc929e3ce0eb38a0b8d7893d0bd09459bb7f78645903076b14c0dfacb43bda85364d96dee9
-MISC metadata.xml 305 SHA256 d26b2b1ced185340a913e1e12a211c68edc8f5e563e7db2724637955147a791f SHA512 5dfdc3bc4e8be9ffb3695b59ea6ef330ef185185a9737d79fd2c067a2cf861dfc10b24a4b712774bdb240ac28ac4ef591d683d8c1e30a887b3476d5947105b97 WHIRLPOOL 4c6896d05e15a6f64d53d3cd8353c3df88ce9c8dd294fee0510fea71743783ec7958df2519eb4a209d31a50bb3b63e95ec91d509419fe05c69239b65335ef7f7
+DIST amavis-logwatch-1.51.03.tgz 87304 SHA256 247f12646f834f6ed067d7aa79ef89f458284a6141391c3d96d6225bb1679c92 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 WHIRLPOOL 3da18a7eedad87b609cf3b8573d1bdfb4ee3561776a500f88b58e5576e33a3184cc1deec32a8d0b9252ac51d9e97ba74c5b223080e82f4fce38a156f3ac6df3c
+EBUILD amavis-logwatch-1.51.03.ebuild 1022 SHA256 ff9094a3385c211eebfd9fd9dc022638d25be4892eb3e10e267d9348add39346 SHA512 5a915f38766a9cc4b41a206cdea023e735e920529d839cbdc38580bdf8fa3fec6d769b74be54e1e13037525f131777dd42fc5f5eaf4c998e3ccee48ec68cd248 WHIRLPOOL 7c4337f3e569b6bca2e990a497eab3cae33e0aa1458fba9f5065dd1f3fa8a58ee2dc060ae556f32a95a1e3079c48f61bd1c70420acded95b9e9afb5ee7593cce
+MISC ChangeLog 692 SHA256 b771508ec757781ceab5aa134d13b2b855cfa2854be5a0b3e36a5ce61c9c78a1 SHA512 0241c2f8b0b441adf9cb50da646f21d940c31d92414e8c9df900ca5e6f2ea1567fb9b669b199437ae43790cc1a817062f029366ef6435a03e0170c716403ba37 WHIRLPOOL b4f914278b5eb5fd89d3661f42e094eca8056e0dd5d2709fb2e83274a98bf76591a4a0dfc7354067674bc70e672f4a7be91df2cb74d6d7db37b7191e957d5a12
+MISC metadata.xml 194 SHA256 75a36199f6e039a448df7de06675d842b74813183c7c8024cf18b6e2b02d6abb SHA512 e0885b033e75da389dc7cbf393fa3959b6c51d157e5b4b866627e633ec4eeee4c298bed4c0121dc7af1585ea1f51747808d33dbdaa6f9c9c8cb27ef233e29968 WHIRLPOOL 8a0b3b4357ebdfd1417a1877877092bca5feeaa359d7c2780eb359e96efcad6e7b64aa8b318d1eb09bfb577509e146ad4fc4c7efa6c446262305d185e0249ba8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJSs4/nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUCi2KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbf6kP/3dgM4xCFoPMX/+5pigLMMR9
-E37Ld2Ccj42gpuYlOzBLiO/fPH8mRCwsHNaHjBLWxv/FEUIWA5Ld9I1GP39AKUhy
-k+WdkVFnMacIlFvCrWVy34hZKQ6hU/tp2hVTSAxvgIqON8FsaRSzlL2t3T582Lwl
-GMcKcFu3bqILmqPkb7aIuar/9JckH76V/y6/JnZWTD77eSXI1bypF3U0U/0vEJTo
-+T3aiiABliLjPx/e7IrnAa39j5uBh8DgkCSSotgQXEOtYY9P95WueL4BeyKW8xxc
-TTUzv4xTYiNVnIDFSxuhdD7FavM2XcrxsLTi48PNWZLZ5+HtVFUNflqBddGFGAIi
-yze3FnEGrjM5/M+4NARM0wbPNWgYD+z3rAX9BNMCKTavJb62Pg3ymFMR6F50Heb0
-q+v/9Ae/fbxwV5dUqxIlHuO6rcdHfS4Ns4xKkeXjRR7wI7hDhjvqXkvqtvMI0oJJ
-60LpoSfhZ/YGupJrxfYciQegBAbtMxjsmlJpCGzpIkem89gTSfbZuvzxkfqf7v5l
-96K112FDs3d4UGVkuzeuL9TD82iPnPvuZap0bFam4NSY69yE6rw407CnaxYlhtLT
-iArGScrz03MipCsG+5tvR9tXRwI68+ccByrdw6ca6z02mPnBXZbzu5WrUEuzpNlU
-Al4DqtELUvQlCY3NpVp0
-=1Nci
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbVocP/i9nzsUZwYgIVnuY4YJc4ieu
+ifcuieIgJa+YdzjJv4y1G3J4Qu+6HGYF0YbjBy4CdY8cZx0zjF0frZFNibVr7wJQ
+9swNej8ZjSC6QF2Lky2/HUvBFXb8T0F+svZSv+02HnuNx8dDatJcmXeCXPcNClcs
+Vf495SkIt6iM6cLqjW0H1+5PaTh0dA78ku/n7X9fCtq9lY5rIG80uTs5vC6LV5DV
+JVHxmXmtUJ0UoE5JPEyINo+aUFGvtliRFm9da2shiFxZFVaiL6OqCVX4kLGmo+HA
+TxYF2t6JZtAs5aDkOD6O0V1LIBedrskS0Bds5O24GSRDgUmdFGA2z23ko9VD4cTp
+HduNFac3qRNvQozP17al6whc1MH8Bmqzww0Fmd4xSIQy4WnvyDpow4oZN/UUgwpn
+6R98Eomdi29xdAx4scuZ1Zc0UyZGk2mJV2di3+x2tP9++2rTxC8U8XzMySCbsn+0
+X/vbWM/WB89VGMbW4hTnyT+5DsrmzJOZ/l6R97px3QSiIiqOo1m5+Md2ePF92FwK
+XcunO+bL8Wm6bAYFIjzZlJgewYod8ApdCy6AjM5zVExOIR8uoMXWn+gdSiVgETkt
+HEG+1Ylg22FJfgOtUS6BPPxFqwypp1joyhcD1GhN/SgjtbTD6qbjgquckfJVKu8T
+xBhkiazstge/ugL663L4
+=bwPJ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild
deleted file mode 100644
index cfe3b22b034d..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild,v 1.1 2013/12/20 00:31:31 mjo Exp $
-
-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"
-
-# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
-# thus obsolete this use flag.
-IUSE="logwatch"
-
-RDEPEND="dev-lang/perl
-	logwatch? ( !>sys-apps/logwatch-7.4.0 )"
-
-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() {
-	# There are two different "versions" of the package in the
-	# tarball: a standalone executable and a logwatch filter. The
-	# standalone is always installed. However, the logwatch filter is
-	# only installed with USE="logwatch".
-	dodoc Bugs Changes README
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-
-	if use logwatch; then
-		# Remove the taint mode (-T) switch from the header of the
-		# standalone executable, and save the result as our logwatch
-		# filter.
-		#
-		# We don't do this for the standalone script because it's nice
-		# to have the taint flag when it works.
-		#
-		sed 's~^#!/usr/bin/perl -T$~#!/usr/bin/perl~' ${PN} > amavis \
-			|| die 'failed to remove the perl taint switch'
-
-		insinto /etc/logwatch/scripts/services
-		doins amavis
-
-		insinto /etc/logwatch/conf/services
-		newins ${PN}.conf amavis.conf
-	fi
-}
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
new file mode 100644
index 000000000000..62ab3716c406
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild,v 1.1 2014/09/05 21:39:21 mjo Exp $
+
+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
+}
diff --git a/net-mail/amavis-logwatch/metadata.xml b/net-mail/amavis-logwatch/metadata.xml
index 67039ac9c764..b81e437e9342 100644
--- a/net-mail/amavis-logwatch/metadata.xml
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>mjo@gentoo.org</email></maintainer>
-<use>
-  <flag name='logwatch'>
-    Install filters for use with <pkg>sys-apps/logwatch</pkg>.
-  </flag>
-</use>
 </pkgmetadata>