latest cvs snapshot + patches. fixes #141649, #158549, #174870, #183762, #190385, #244613, #256885, #260524, #291029

(Portage version: 2.2_rc49/cvs/Linux i686)

4 files changed, 21 insertions, 85 deletions

diff --git a/sys-apps/logwatch/ChangeLog b/sys-apps/logwatch/ChangeLog
index 59da420c1950..8b65b8ea484b 100644
--- a/sys-apps/logwatch/ChangeLog
+++ b/sys-apps/logwatch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/logwatch
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.61 2009/02/26 15:11:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.62 2009/12/04 11:21:58 hollow Exp $
+
+*logwatch-7.3.7_pre20091204 (04 Dec 2009)
+
+  04 Dec 2009; Benedikt Böhm <hollow@gentoo.org> -logwatch-7.3.2.ebuild,
+  -logwatch-7.3.4.ebuild, +logwatch-7.3.7_pre20091204.ebuild,
+  files/logwatch:
+  latest cvs snapshot + patches. fixes #141649, #158549, #174870, #183762,
+  #190385, #244613, #256885, #260524, #291029
 
   26 Feb 2009; Raúl Porcel <armin76@gentoo.org> logwatch-7.3.6.ebuild:
   x86 stable wrt #259730
diff --git a/sys-apps/logwatch/files/logwatch b/sys-apps/logwatch/files/logwatch
index 3640fcfe1c22..4d4a2227b315 100755
--- a/sys-apps/logwatch/files/logwatch
+++ b/sys-apps/logwatch/files/logwatch
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 if [ -x /usr/sbin/logwatch.pl ] ; then
-	exec /usr/sbin/logwatch.pl 2>&1 > /dev/null
+	exec /usr/sbin/logwatch.pl --output mail
 fi
diff --git a/sys-apps/logwatch/logwatch-7.3.4.ebuild b/sys-apps/logwatch/logwatch-7.3.4.ebuild
deleted file mode 100644
index c83a3c0bc85e..000000000000
--- a/sys-apps/logwatch/logwatch-7.3.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.3.4.ebuild,v 1.2 2007/03/23 23:00:35 killerfox Exp $
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
-SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/cron
-	virtual/mta
-	dev-lang/perl
-	dev-perl/Tie-IxHash
-	dev-perl/Date-Calc
-	virtual/mailx"
-DEPEND=""
-
-src_install() {
-	dodir /usr/share/logwatch/lib
-	dodir /usr/share/logwatch/scripts/services
-	dodir /usr/share/logwatch/scripts/shared
-	dodir /usr/share/logwatch/default.conf/logfiles
-	dodir /usr/share/logwatch/default.conf/services
-	dodir /usr/share/logwatch/default.conf/html
-	dodir /etc/logwatch
-	keepdir /var/cache/logwatch
-
-	newsbin scripts/logwatch.pl logwatch.pl || die "dosbin logwatch failed"
-
-	for i in scripts/logfiles/* ; do
-		exeinto /usr/share/logwatch/$i
-		doexe $i/* || die "doexe $i failed"
-	done
-
-	exeinto /usr/share/logwatch/lib
-	doexe lib/*.pm
-
-	exeinto /usr/share/logwatch/scripts/services
-	doexe scripts/services/*
-
-	exeinto /usr/share/logwatch/scripts/shared
-	doexe scripts/shared/*
-
-	insinto /usr/share/logwatch/default.conf
-	doins conf/logwatch.conf
-
-	insinto /usr/share/logwatch/default.conf/logfiles
-	doins conf/logfiles/*
-
-	insinto /usr/share/logwatch/default.conf/services
-	doins conf/services/*
-
-	insinto /usr/share/logwatch/default.conf/html
-	doins conf/html/*
-
-	# Make sure logwatch is run before anything else #100243
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch 00-logwatch
-
-	doman logwatch.8
-	dodoc project/CHANGES README HOWTO-Customize-LogWatch
-}
-
-pkg_postinst() {
-	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
-		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
-		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
-			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
-			|| ewarn "You have two logwatch files in /etc/cron.daily/"
-	fi
-}
diff --git a/sys-apps/logwatch/logwatch-7.3.2.ebuild b/sys-apps/logwatch/logwatch-7.3.7_pre20091204.ebuild
index e65c9628d6fc..64e3c2e8e078 100644
--- a/sys-apps/logwatch/logwatch-7.3.2.ebuild
+++ b/sys-apps/logwatch/logwatch-7.3.7_pre20091204.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.3.2.ebuild,v 1.7 2007/06/13 16:17:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.3.7_pre20091204.ebuild,v 1.1 2009/12/04 11:21:58 hollow Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org/"
-SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND=""
 RDEPEND="virtual/cron
 	virtual/mta
+	virtual/mailx
 	dev-lang/perl
-	dev-perl/Tie-IxHash
 	dev-perl/Date-Calc
-	virtual/mailx"
-DEPEND=""
+	dev-perl/DateManip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
 
 src_install() {
 	dodir /usr/share/logwatch/lib
@@ -26,7 +29,7 @@ src_install() {
 	dodir /usr/share/logwatch/default.conf/logfiles
 	dodir /usr/share/logwatch/default.conf/services
 	dodir /usr/share/logwatch/default.conf/html
-	dodir /etc/logwatch
+	keepdir /etc/logwatch
 	keepdir /var/cache/logwatch
 
 	newsbin scripts/logwatch.pl logwatch.pl || die "dosbin logwatch failed"