summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth/munge')
-rw-r--r--sys-auth/munge/ChangeLog6
-rw-r--r--sys-auth/munge/munge-0.5.9.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/sys-auth/munge/ChangeLog b/sys-auth/munge/ChangeLog
index 8b001903216f..ce18a6300850 100644
--- a/sys-auth/munge/ChangeLog
+++ b/sys-auth/munge/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-auth/munge
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.1 2010/11/14 23:04:40 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.2 2010/12/04 18:22:24 jsbronder Exp $
+
+ 04 Dec 2010; Justin Bronder <jsbronder@gentoo.org> munge-0.5.9.ebuild:
+ Conditionally remove unnecessary directories; they're only created if certain
+ directories already exist in /etc. #346683
*munge-0.5.9 (14 Nov 2010)
diff --git a/sys-auth/munge/munge-0.5.9.ebuild b/sys-auth/munge/munge-0.5.9.ebuild
index d4f8692fac33..ce87f4f26767 100644
--- a/sys-auth/munge/munge-0.5.9.ebuild
+++ b/sys-auth/munge/munge-0.5.9.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-auth/munge/munge-0.5.9.ebuild,v 1.1 2010/11/14 23:04:40 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.9.ebuild,v 1.2 2010/12/04 18:22:24 jsbronder Exp $
EAPI=3
inherit eutils
@@ -53,7 +53,9 @@ src_install() {
diropts -o munge -g munge -m700
dodir /var/log/munge || die
- rm -r "${D}"/etc/{init.d,default} || die
+ [ -d "${D}"/etc/init.d ] && rm -r "${D}"/etc/init.d
+ [ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default
+ [ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig
newconfd "${FILESDIR}"/${PN}d.confd ${PN}d || die
newinitd "${FILESDIR}"/${PN}d.initd ${PN}d || die