fix #305527

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

3 files changed, 9 insertions, 80 deletions

diff --git a/sys-apps/logwatch/ChangeLog b/sys-apps/logwatch/ChangeLog
index 36ca89b8f784..06590a16e536 100644
--- a/sys-apps/logwatch/ChangeLog
+++ b/sys-apps/logwatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/logwatch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.68 2010/02/11 10:23:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.69 2010/02/17 19:56:02 hollow Exp $
+
+*logwatch-7.3.7_pre20100217 (17 Feb 2010)
+
+  17 Feb 2010; Benedikt Böhm <hollow@gentoo.org>
+  -logwatch-7.3.7_pre20091204.ebuild, -logwatch-7.3.7_pre20100211.ebuild,
+  +logwatch-7.3.7_pre20100217.ebuild:
+  fix #305527
 
 *logwatch-7.3.7_pre20100211 (11 Feb 2010)
 
diff --git a/sys-apps/logwatch/logwatch-7.3.7_pre20091204.ebuild b/sys-apps/logwatch/logwatch-7.3.7_pre20091204.ebuild
deleted file mode 100644
index 559cfca9571b..000000000000
--- a/sys-apps/logwatch/logwatch-7.3.7_pre20091204.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.7_pre20091204.ebuild,v 1.4 2009/12/31 16:32:56 ranger Exp $
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/cron
-	virtual/mta
-	virtual/mailx
-	dev-lang/perl
-	dev-perl/Date-Calc
-	dev-perl/DateManip
-	dev-perl/Tie-IxHash
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo"
-
-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
-	keepdir /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.7_pre20100211.ebuild b/sys-apps/logwatch/logwatch-7.3.7_pre20100217.ebuild
index 6017919f2f4f..f6cc4313e26c 100644
--- a/sys-apps/logwatch/logwatch-7.3.7_pre20100211.ebuild
+++ b/sys-apps/logwatch/logwatch-7.3.7_pre20100217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.3.7_pre20100211.ebuild,v 1.1 2010/02/11 10:23:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.3.7_pre20100217.ebuild,v 1.1 2010/02/17 19:56:02 hollow Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org/"