Fix bug #449968 by flameeyes. Remove old.

(Portage version: 2.1.12.2/cvs/Linux i686, signed Manifest commit with key 30427902)

3 files changed, 18 insertions, 51 deletions

diff --git a/app-admin/logcheck/ChangeLog b/app-admin/logcheck/ChangeLog
index 4946246eb305..651747c7b406 100644
--- a/app-admin/logcheck/ChangeLog
+++ b/app-admin/logcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/logcheck
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/ChangeLog,v 1.28 2012/12/30 18:55:08 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/ChangeLog,v 1.29 2013/06/22 15:24:19 phajdan.jr Exp $
+
+*logcheck-1.3.15-r2 (21 Jun 2013)
+
+  21 Jun 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> -logcheck-1.3.14.ebuild,
+  -logcheck-1.3.15.ebuild, +logcheck-1.3.15-r2.ebuild:
+  Fix bug #449968 by flameeyes. Remove old.
 
   30 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   logcheck-1.3.15-r1.ebuild:
diff --git a/app-admin/logcheck/logcheck-1.3.14.ebuild b/app-admin/logcheck/logcheck-1.3.14.ebuild
deleted file mode 100644
index 2d348991f7fc..000000000000
--- a/app-admin/logcheck/logcheck-1.3.14.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.14.ebuild,v 1.6 2012/06/04 02:15:38 xmw Exp $
-
-inherit eutils user
-
-DESCRIPTION="Mails anomalies in the system logfiles to the administrator."
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-admin/logsentry
-	app-misc/lockfile-progs
-	dev-lang/perl
-	dev-perl/mime-construct
-	virtual/mailx
-	${DEPEND}"
-
-pkg_setup() {
-	enewgroup logcheck
-	enewuser logcheck -1 -1 -1 logcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	keepdir /var/{lib,lock}/logcheck
-	dodoc AUTHORS CHANGES CREDITS TODO docs/README.* || die "dodoc failed"
-	doman docs/logtail.8 docs/logtail2.8 || die "doman failed"
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}/${PN}.cron" || die "doexe failed"
-}
-
-pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/{lib,lock}/logcheck \
-		|| die "chown failed"
-
-	elog "Please read the guide ad http://www.gentoo.org/doc/en/logcheck.xml"
-	elog "for installation instructions."
-}
diff --git a/app-admin/logcheck/logcheck-1.3.15.ebuild b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
index dccaf926681d..7a299ee96c57 100644
--- a/app-admin/logcheck/logcheck-1.3.15.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.15.ebuild,v 1.1 2012/07/31 15:53:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.15-r2.ebuild,v 1.1 2013/06/22 15:24:19 phajdan.jr Exp $
 
 EAPI="4"
 
@@ -30,7 +30,13 @@ pkg_setup() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	keepdir /var/{lib,lock}/logcheck
+
+	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
+	# the directories removed are empty.
+	rmdir "${D}/var/lock/logcheck" || die
+	rmdir "${D}/var/lock" || die
+
+	keepdir /var/lib/logcheck
 	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
 	doman docs/logtail.8 docs/logtail2.8
 
@@ -39,7 +45,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/{lib,lock}/logcheck || die
+	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
 
 	elog "Please read the guide ad http://www.gentoo.org/doc/en/logcheck.xml"
 	elog "for installation instructions."