diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-06-05 12:07:06 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-06-05 12:07:06 +0000 |
| commit | 0eddbf3b0a7225e24e251a650beb0a7062fad229 (patch) | |
| tree | 4c475a4a0f115f2f93d4f8088fbad7a1a272f708 /app-emacs | |
| parent | Add github to remote-id in metadata.xml (diff) | |
| download | gentoo-2-0eddbf3b0a7225e24e251a650beb0a7062fad229.tar.gz gentoo-2-0eddbf3b0a7225e24e251a650beb0a7062fad229.tar.bz2 gentoo-2-0eddbf3b0a7225e24e251a650beb0a7062fad229.zip | |
Remove backwards compatibility code for site-start.el.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/emacs-common-gentoo/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild | 31 |
2 files changed, 5 insertions, 31 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index 75557950c516..0317879d4d56 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emacs/emacs-common-gentoo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.123 2015/04/17 12:24:38 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.124 2015/06/05 12:07:06 ulm Exp $ + + 05 Jun 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-1.5.ebuild: + Remove backwards compatibility code for site-start.el. 17 Apr 2015; Ulrich Müller <ulm@gentoo.org> -emacs-common-gentoo-1.4-r1.ebuild: diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild index 30945ac77620..85267a16bcf7 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.5.ebuild,v 1.10 2015/04/17 10:40:33 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.11 2015/06/05 12:07:06 ulm Exp $ EAPI=5 @@ -69,20 +69,6 @@ src_install() { readme.gentoo_create_doc } -site-start-modified-p() { - case $(cksum <"${EROOT}${SITELISP}/site-start.el") in - # checksums of auto-generated site-start.el files - "2098727038 349") return 1 ;; # elisp-common.eclass - "3626264063 355") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.1) - "3738455534 394") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.6) - "4199862847 394") return 1 ;; # emacs-common-gentoo-1.1 - "2547348044 394") return 1 ;; # emacs-common-gentoo-1.2 - "2214952934 397") return 1 ;; # emacs-common-gentoo-1.2-r1 - "3917799317 397") return 1 ;; # emacs-common-gentoo-1.2-r2 - *) return 0 ;; - esac -} - pkg_preinst() { # make sure that site-gentoo.el exists since site-start.el requires it if [[ ! -d ${EROOT}${SITELISP} ]]; then @@ -119,21 +105,6 @@ pkg_preinst() { chmod 775 "${EROOT}"/var/games/emacs || die fi fi - - 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 - 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" - fi - fi } pkg_postinst() { |