diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-05-18 06:11:56 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-05-18 06:11:56 +0000 |
| commit | 1080371936888c292efd85b1ee6362ce16a2bb3f (patch) | |
| tree | f784b251bc4a38d5692f153986dd9f2195d89784 /eclass | |
| parent | Copied from Portage tree. (diff) | |
| download | emacs-1080371936888c292efd85b1ee6362ce16a2bb3f.tar.gz emacs-1080371936888c292efd85b1ee6362ce16a2bb3f.tar.bz2 emacs-1080371936888c292efd85b1ee6362ce16a2bb3f.zip | |
Create file for backwards compatibility only if obsolete files were found.
svn path=/emacs-overlay/; revision=1069
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 37 |
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 |