summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-03-13 09:12:45 +0000
committerUlrich Müller <ulm@gentoo.org>2009-03-13 09:12:45 +0000
commita8bef472516140ff353db64a354373336a8f4b69 (patch)
treec2cf4b6bd9ddbe57babd03e25fafc8b866499fb5 /app-emacs
parentSystem for managing development buildouts. (diff)
downloadgentoo-2-a8bef472516140ff353db64a354373336a8f4b69.tar.gz
gentoo-2-a8bef472516140ff353db64a354373336a8f4b69.tar.bz2
gentoo-2-a8bef472516140ff353db64a354373336a8f4b69.zip
Remove orphan files only if this is not a reinstall.
(Portage version: 2.2_rc25/cvs/Linux i686)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/emacs-common-gentoo/ChangeLog6
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild10
2 files changed, 12 insertions, 4 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 14c5c67a217f..09ce5723811d 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/emacs-desktop
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.2 2009/03/12 09:44:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.3 2009/03/13 09:12:45 ulm Exp $
+
+ 13 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
+ emacs-common-gentoo-1.0.ebuild:
+ Remove orphan files only if this is not a reinstall.
*emacs-common-gentoo-1.0 (12 Mar 2009)
*emacs-common-gentoo-0.3 (12 Mar 2009)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
index a34408073fbc..2e5ecfb2e8b7 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild,v 1.2 2009/03/12 14:08:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild,v 1.3 2009/03/13 09:12:45 ulm Exp $
inherit elisp-common eutils fdo-mime gnome2-utils
@@ -16,8 +16,12 @@ IUSE="X"
PDEPEND="virtual/emacs"
pkg_setup() {
- # clean up orphan file installed by old Emacs ebuilds
- rm -f "${ROOT}${SITELISP}/subdirs.el"
+ if [ -e "${ROOT}${SITELISP}/subdirs.el" ] \
+ && ! has_version ">=${CATEGORY}/${PN}-1"
+ then
+ ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
+ rm -f "${ROOT}${SITELISP}/subdirs.el"
+ fi
}
src_install() {