From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 4 Dec 2013 01:18:02 +0000 (-0500)
Subject: Bump postfix-logwatch to 1.40.00 which has a license change and a few fixes.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=fdfae9a2d572a9e0e3491d603c3b7030748013d4;p=mjo-overlay.git

Bump postfix-logwatch to 1.40.00 which has a license change and a few fixes.
Fix the default config file location for the postfix-logwatch standalone.
---

diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index 9e482a3..81f876b 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,4 +1,3 @@
-DIST postfix-logwatch-1.39.07.tgz 114032 SHA256 85d53a8748e0210e1890cf1558c03b1fb27935f2b3a1fc056718d5a3abbe6b12 SHA512 9fd4451e35af5b73c9a26eed6263490a70b31cf4ec65e5f1e7c5070166388e4ef91cb418bee3454a1efef9313a918d491a1a923112c215119cfe2d95d6b81a68 WHIRLPOOL 968e3a57e1dab9575d200424f99a008dd1768098ab6aac88bd26f976b4afb24419311d3a0ebd7d0601a44e0c65b33fa98f41e620914be81397957df21d3b46f3
-EBUILD postfix-logwatch-1.39.07.ebuild 1381 SHA256 87fdc9987946b7a24bd254bb2e966013c39d709a668ac6918c5d8b6a84e65968 SHA512 5c1779801a99a91f393b45c1a467c88bda1f0fe498023d5f565a2eb383a95da704b49447e701c0b73b3372be83e5e3434ed16a1909a0a4f423b733b2bd86f643 WHIRLPOOL 558121e81b959e564208eb16c937dc4c96babb7a9870cbcb56f264123dfd62aff64dd4cf6ac3dbfbacfc74a9d4936863b0bd492ee6812b2419d63c787ec43c9a
-MISC ChangeLog 452 SHA256 a20aea5ee84fbe4aedfeddc47640709efe9cf86cb3832d963db3347be2aeb718 SHA512 0bb2283494e19166db0d8d3d7c050753a3340630c6dd10031e307f3d5d754fbb834e2997566ddad1515d5bfdbfde2de5ac1469f5d5e6216c0d28b72780bbd66c WHIRLPOOL dc0f7550a379e934a75996cbb45c9e7694d64eb2ef219f0ec10319b86051316071d8e9ec4fef384f0dc4d3713b48520aea5776aa603150cf6ca17c06f1d65b94
+DIST postfix-logwatch-1.40.00.tgz 107441 SHA256 d72a9a91a6871606810485b342ca684a2e8724897b9c906cc27d3df7a15b2616 SHA512 c388cfefceeefcc19bc987865dbe0312ef0f470524ebd8af33abe639137cce699ad79f33b2b64168d2d572981372a9af58e60f6cdfbc661fc56ab64f1c19be03 WHIRLPOOL 027af839c2118eb4abb00c9417ecd4c612a8f6ed81d26461c6025df4effe644b9a809c57d90474f8d515326b3528f6b0311c7b9626fa655e158cfa4712d1abd8
+EBUILD postfix-logwatch-1.40.00.ebuild 1686 SHA256 90986c7cf7f7be7854f7816d54889a1e468d546aa66a66ef540f621399295b70 SHA512 c5fc1879cc595cfe316b3dc21a794e74d330a60058c72a996c53d77558408576f381755d9961164d0367bd7b5d76d6fde1b7b9902f417175c9d6705634fb8e6e WHIRLPOOL f7979e1b0174cb05dbb0561cb4e55b347132ef97e08c010a751a7c7892999e8f8a04c559cd366a4b6492cfebd341850fcafc1409ba363b3994db08f29eaf0439
 MISC metadata.xml 305 SHA256 d26b2b1ced185340a913e1e12a211c68edc8f5e563e7db2724637955147a791f SHA512 5dfdc3bc4e8be9ffb3695b59ea6ef330ef185185a9737d79fd2c067a2cf861dfc10b24a4b712774bdb240ac28ac4ef591d683d8c1e30a887b3476d5947105b97 WHIRLPOOL 4c6896d05e15a6f64d53d3cd8353c3df88ce9c8dd294fee0510fea71743783ec7958df2519eb4a209d31a50bb3b63e95ec91d509419fe05c69239b65335ef7f7
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
similarity index 73%
rename from net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild
rename to net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
index ab85c5b..dfb8533 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild,v 1.1 2013/12/03 13:28:25 mjo Exp $
+# $Header: $
 
 EAPI=5
 
@@ -8,13 +8,21 @@ DESCRIPTION="A log analyzer for postfix"
 HOMEPAGE="http://logreporters.sourceforge.net/"
 SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="logwatch"
 
 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.
@@ -36,6 +44,10 @@ src_install() {
 		# 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} > postfix \
 			|| die "failed to remove the perl taint switch"