Version bump and license change.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!)

2 files changed, 27 insertions, 5 deletions

diff --git a/net-mail/postfix-logwatch/ChangeLog b/net-mail/postfix-logwatch/ChangeLog
index ab6a4afad301..ef7602aacd56 100644
--- a/net-mail/postfix-logwatch/ChangeLog
+++ b/net-mail/postfix-logwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/postfix-logwatch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/ChangeLog,v 1.2 2013/12/03 13:43:14 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/ChangeLog,v 1.3 2013/12/20 00:02:07 mjo Exp $
+
+*postfix-logwatch-1.40.00 (20 Dec 2013)
+
+  20 Dec 2013; Michael Orlitzky <mjo@gentoo.org>
+  +postfix-logwatch-1.40.00.ebuild, -postfix-logwatch-1.39.07.ebuild:
+  Version bump and license change.
 
 *postfix-logwatch-1.39.07 (03 Dec 2013)
 
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.39.07.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
index ab85c5b2bb9b..9f883056f6d0 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: /var/cvsroot/gentoo-x86/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild,v 1.1 2013/12/20 00:02:07 mjo Exp $
 
 EAPI=5
 
@@ -8,12 +8,24 @@ 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"
+
+# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
+# thus obsolete this use flag.
 IUSE="logwatch"
 
-RDEPEND="dev-lang/perl"
+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
@@ -36,8 +48,12 @@ 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"
+			|| die 'failed to remove the perl taint switch'
 
 		insinto /etc/logwatch/scripts/services
 		doins postfix