ulm 15/06/05 12:07:06 Modified: ChangeLog emacs-common-gentoo-1.5.ebuild Log: Remove backwards compatibility code for site-start.el. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path 1.124 app-emacs/emacs-common-gentoo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.124&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.124&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?r1=1.123&r2=1.124 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- ChangeLog 17 Apr 2015 12:24:38 -0000 1.123 +++ ChangeLog 5 Jun 2015 12:07:06 -0000 1.124 @@ -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 <[email protected]> emacs-common-gentoo-1.5.ebuild: + Remove backwards compatibility code for site-start.el. 17 Apr 2015; Ulrich Müller <[email protected]> -emacs-common-gentoo-1.4-r1.ebuild: 1.11 app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?r1=1.10&r2=1.11 Index: emacs-common-gentoo-1.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-common-gentoo-1.5.ebuild 17 Apr 2015 10:40:33 -0000 1.10 +++ emacs-common-gentoo-1.5.ebuild 5 Jun 2015 12:07:06 -0000 1.11 @@ -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 @@ 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 @@ 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() {
