diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-05-21 21:19:20 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-05-21 21:19:20 +0000 |
| commit | ddf578d44c1bd9b4cded60a7d34d877f7d866baa (patch) | |
| tree | b2622925c28f21bbede89f028e31c89a9c0e2720 /eclass | |
| parent | Restore from r1057. (diff) | |
| download | emacs-ddf578d44c1bd9b4cded60a7d34d877f7d866baa.tar.gz emacs-ddf578d44c1bd9b4cded60a7d34d877f7d866baa.tar.bz2 emacs-ddf578d44c1bd9b4cded60a7d34d877f7d866baa.zip | |
Restore from r1041.
svn path=/emacs-overlay/; revision=1071
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 37 |
2 files changed, 18 insertions, 24 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f1e8b20..52c13fe 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,8 +1,3 @@ -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 3fe6c9a..ee4db83 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -395,28 +395,27 @@ for greater flexibility, users can load individual package-specific initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/. EOF echo - fi - - - 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 + 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 + # cleanup rm -f "${tmpdir}"/site-{gentoo,start}.el } |