summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-05-21 21:26:05 +0000
committerUlrich Müller <ulm@gentoo.org>2008-05-21 21:26:05 +0000
commitc9d7dc996627ff927c1cb5429639610de9be1e0b (patch)
tree4abd220af0c770bc85f8dc4f4ab3d63ffb32d529 /eclass
parentRestore from r1041. (diff)
downloademacs-c9d7dc996627ff927c1cb5429639610de9be1e0b.tar.gz
emacs-c9d7dc996627ff927c1cb5429639610de9be1e0b.tar.bz2
emacs-c9d7dc996627ff927c1cb5429639610de9be1e0b.zip
Create file for backwards compatibility only if obsolete files were found.
svn path=/emacs-overlay/; revision=1072
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/elisp-common.eclass37
2 files changed, 24 insertions, 18 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 52c13fe..f1e8b20 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-18 Ulrich Mueller <ulm@gentoo.org>
+
+ * elisp-common.eclass (elisp-site-regen): Create file for
+ backwards compatibility only if obsolete files were found.
+
2008-03-28 Ulrich Mueller <ulm@gentoo.org>
* elisp-common.eclass (elisp-site-regen): Check if the SITELISP
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index ee4db83..3fe6c9a 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -395,26 +395,27 @@ for greater flexibility, users can load individual package-specific
initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
EOF
echo
-
- if [ "${obsolete}" ]; then
- while read line; do ewarn "${line}"; done <<-EOF
- Site-initialisation files of Emacs packages are now installed in
- /usr/share/emacs/site-lisp/site-gentoo.d/. You may consider using
- /usr/sbin/emacs-updater to rebuild the installed Emacs packages.
- However, the old location is still supported.
- EOF
- echo
- fi
fi
- # Kludge for backwards compatibility: During pkg_postrm, old versions
- # of this eclass (saved in the VDB) won't find packages' site-init files
- # in the new location. So we copy them to an auxiliary file that is
- # visible to old eclass versions.
- for sf in "${sflist[@]}"; do
- [ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
- && cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
- done
+
+ if [ "${obsolete}" ]; then
+ while read line; do ewarn "${line}"; done <<-EOF
+ Site-initialisation files of Emacs packages are now installed in
+ /usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
+ that you use /usr/sbin/emacs-updater to rebuild the installed
+ Emacs packages.
+ EOF
+ echo
+
+ # Kludge for backwards compatibility: During pkg_postrm, old versions
+ # of this eclass (saved in the VDB) won't find packages' site-init
+ # files in the new location. So we copy them to an auxiliary file
+ # that is visible to old eclass versions.
+ for sf in "${sflist[@]}"; do
+ [ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
+ && cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
+ done
+ fi
# cleanup
rm -f "${tmpdir}"/site-{gentoo,start}.el