fix #305527

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 12 insertions, 85 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/Manifest b/sys-apps/logwatch/Manifest
index fbcfaecc63da..7dc50f424b40 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,11 +1,9 @@
 AUX logwatch 95 RMD160 cca314b2cae2d6c7796d1621a81649db77f3d8a4 SHA1 13a56a61d60f3a360155ae0c9d1a04cdffe4e795 SHA256 6b1012405b4e3cf7df768fb88c390e5475202bc0dc50e0cea7cdfef9f823df51
 DIST logwatch-7.3.6.tar.gz 297296 RMD160 859e1e050b43d37a92fb46dd884807dffe44cb1a SHA1 6cc234e926ec7be1334d46c0e356df1b80701095 SHA256 84b7cc37d075674e0d69df2ef4d1b4464129b43d5ca1607af0852ef96f51bc3e
-DIST logwatch-7.3.7_pre20091204.tar.bz2 267231 RMD160 e7ecfd647369813aa2ebf0712283fcdb7393a015 SHA1 335da2662b7b531287b0c7ef66721e594f8f78f5 SHA256 7626306bdf02544db458c7ab9dc4e2d349a7648915882a449341cbe0f3b33e8f
 DIST logwatch-7.3.7_pre20091210.tar.bz2 267627 RMD160 09c85730d213f56e10ea5254a99e0f4b0a245c79 SHA1 a4ae716e8c58cf850cef19af6be29a8cbe2fa341 SHA256 87955c7865e9e55be65291f95fe361cb1f0093e474ceb739991de7dc0654a101
-DIST logwatch-7.3.7_pre20100211.tar.bz2 270911 RMD160 809d8a724288a17e7dbc51374ca5c6bf3454d58a SHA1 48eac1796f659092de5905f380da90d9312ec02c SHA256 623284a438ffa7dc99f8d99abbc68467d0f5e786342e18d3ca80e29b9fc1af59
+DIST logwatch-7.3.7_pre20100217.tar.bz2 270843 RMD160 65f64e735177bc94b5fef6bede5e254ac784ccd3 SHA1 0483fb244cde5753fea82fae9e64a403fabfd469 SHA256 c63af00c88e7089116853d59d2a307813ee2c5e19179870c8e5c9614fdd5bd41
 EBUILD logwatch-7.3.6.ebuild 2071 RMD160 d58c7838fc54c2829b3acba39f9fea274ac88017 SHA1 035a5801bc9210058155b825f6317459d07f4877 SHA256 9f68d9fc6f155b84b92cecbd334172efc10e55a9c8353b748a0636cb60c9af72
-EBUILD logwatch-7.3.7_pre20091204.ebuild 2112 RMD160 47c4a1b463574cc4eaec3192adf52878d838155f SHA1 29cb66ce2ec82629fa2309505ea33e521f2a9716 SHA256 b922c7ef0ffedf7513a3769dcfed57b30a6ce83a0f6721abbbc401df57648951
 EBUILD logwatch-7.3.7_pre20091210.ebuild 2112 RMD160 37e12f3ef89a780c0116405de1ed942f8b1b5705 SHA1 a79d84d9d73741c7709dac3609c6ceeee4ce4cf5 SHA256 fed50288e7900d963bbdf48e34639812e19c6b06a7027e7fe09b2677fcbc51cc
-EBUILD logwatch-7.3.7_pre20100211.ebuild 2112 RMD160 122534774259cd76d1635021e32ad08ac9fd66b8 SHA1 2e3ec3d5b4c1d43be7c165b423c42c327c09595f SHA256 d48239831ea30a1ec8779af5db65141c4306ca24ad56322d2a6ed0e5af16f2bf
-MISC ChangeLog 9603 RMD160 d34d0407b70450dccf2eb5577e6654063eb7ba79 SHA1 4c3124e8e32c875ffa5db43320527484ba43d5a4 SHA256 579b9a27685add1980748bf75728185af2370b4a58ea959824ebc5e8f12a3767
+EBUILD logwatch-7.3.7_pre20100217.ebuild 2112 RMD160 d4209708da5865e50501d5190da78979e75f1a9e SHA1 716b4a85d23dc638d9bbcd9d4b8054af84c708a2 SHA256 6d3437ee2c5cbb7fc203f1c974ce9bdb74a471d5bfc398b6a42d827d61d75aa1
+MISC ChangeLog 9823 RMD160 bf721cffd0ddd8635316b8402d2c1df91aa94f34 SHA1 6f3bb31a74c34a687c242b57d875ca8c23175371 SHA256 e36ff3e3132e51205b950917d2f321c1d3e6263dfa94ab5461b3c4a45cb8ad54
 MISC metadata.xml 277 RMD160 b1512f4b6fd0391cfef0849b5a7c2bfb5fd5a1ef SHA1 dc77ac39800e78aacd39e2bfcfffac59f3ebea39 SHA256 be92694b152297aaaf51bbba985fdd288c1ae58b1e95effcf3f44d3fdc5e707f
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/"