diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-11-13 10:48:47 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-11-13 10:48:47 +0100 |
| commit | a9d1eb636d5c5d016f9daab7113520a97f469361 (patch) | |
| tree | ca6ad05e4228cf0ebdc4199108c1e92bd4e5cb90 /app-emacs | |
| parent | Fix ChangeLog. (diff) | |
| download | emacs-a9d1eb636d5c5d016f9daab7113520a97f469361.tar.gz emacs-a9d1eb636d5c5d016f9daab7113520a97f469361.tar.bz2 emacs-a9d1eb636d5c5d016f9daab7113520a97f469361.zip | |
Refuse installation if the site-start.el file is still in its old location; we have warned about this since almost two years.
Package-Manager: portage-2.2.7
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/emacs-common-gentoo/ChangeLog | 4 | ||||
| -rw-r--r-- | app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 26 |
2 files changed, 18 insertions, 12 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index f75d40d..613b87d 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Nov 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild: + Refuse installation if the site-start.el file is still in its old location; + we have warned about this since almost two years. + 31 Oct 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild: Create site-gentoo.el in preinst phase and have it belong to this package. diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild index 39dabf4..8994fe0 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild @@ -106,23 +106,16 @@ pkg_preinst() { chown "${GAMES_USER_DED:-games}" "${ED}${f}" || die done fi -} - -pkg_postinst() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi - - readme.gentoo_print_elog if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then ewarn "The location of the site startup file for Emacs has changed to" ewarn "/etc/emacs/site-start.el." if site-start-modified-p; then - ewarn "If your site-start.el file contains your own customisation," - ewarn "you should move it to the new file. In any case, you should" - ewarn "remove the old ${SITELISP}/site-start.el file." + eerror "Locally modified ${SITELISP}/site-start.el file found." + eerror "If this file contains your own customisation, you should" + eerror "move it to /etc/emacs/. In any case, you must remove the" + eerror "file from the old location." + die "Cannot continue unless ${SITELISP}/site-start.el is removed." else ewarn "Removing the old ${SITELISP}/site-start.el file." rm -f "${EROOT}${SITELISP}/site-start.el" @@ -130,6 +123,15 @@ pkg_postinst() { fi } +pkg_postinst() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi + + readme.gentoo_print_elog +} + pkg_postrm() { if use X; then fdo-mime_desktop_database_update |