summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/ChangeLog5
-rw-r--r--sys-apps/baselayout/baselayout-2.1.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 57bd8d62b0de..38b37eabedf9 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,13 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.515 2011/10/11 21:06:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.516 2011/11/21 22:36:06 vapier Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 21 Nov 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
+ Trim old baselayout-1 dirs in /lib/.
+
11 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
Make sure we apply the lib32 de-hack to only the arches where said hack was
put into place #386821 by Jim Faulkner.
diff --git a/sys-apps/baselayout/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild
index bf1c865a7785..a81c341353e1 100644
--- a/sys-apps/baselayout/baselayout-2.1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.4 2011/10/11 21:06:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.5 2011/11/21 22:36:06 vapier Exp $
inherit eutils multilib
@@ -208,6 +208,10 @@ pkg_postinst() {
fi
fi
+ # baselayout leaves behind a lot of .keep files, so let's clean them up
+ find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} +
+ find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
# whine about users with invalid shells #215698
if [[ -e ${ROOT}/etc/passwd ]] ; then
local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)