From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 06CFC138A87 for ; Sun, 22 Feb 2015 18:34:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E10BE0914; Sun, 22 Feb 2015 18:34:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF3D8E0914 for ; Sun, 22 Feb 2015 18:34:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70EF434089A for ; Sun, 22 Feb 2015 18:34:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 349B112533 for ; Sun, 22 Feb 2015 18:34:12 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1424630032.cf5388298e8410048bc3bda7620a81dad9898993.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/ X-VCS-Repository: proj/emacs X-VCS-Files: app-emacs/emacs-common-gentoo/ChangeLog app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild X-VCS-Directories: app-emacs/emacs-common-gentoo/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: cf5388298e8410048bc3bda7620a81dad9898993 X-VCS-Branch: master Date: Sun, 22 Feb 2015 18:34:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9fce956a-a21c-49a6-bb03-c69f12373053 X-Archives-Hash: 172829b2df29e6749e8727183f5a339a commit: cf5388298e8410048bc3bda7620a81dad9898993 Author: Ulrich Müller gentoo org> AuthorDate: Sun Feb 22 18:33:52 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Feb 22 18:33:52 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cf538829 app-emacs/emacs-common-gentoo: Remove all backwards compatibility code from the live ebuild. Package-Manager: portage-2.2.17 --- app-emacs/emacs-common-gentoo/ChangeLog | 3 ++ .../emacs-common-gentoo-9999.ebuild | 44 ---------------------- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index dd4a433..c82b856 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Feb 2015; Ulrich Müller emacs-common-gentoo-9999.ebuild: + Remove all backwards compatibility code from the live ebuild. + 22 Feb 2015; Ulrich Müller +emacs-common-gentoo-9999.ebuild, -emacs-common-gentoo-9999-r1.ebuild: Sync from Portage tree. 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 8187379..b0ccd51 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild @@ -73,20 +73,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 @@ -102,41 +88,11 @@ pkg_preinst() { for f in /var/games/emacs/{snake,tetris}-scores; do if [[ -e ${EROOT}${f} ]]; then cp "${EROOT}${f}" "${ED}${f}" || die - elif [[ -e ${EROOT}/var/lib${f#/var} ]]; then - # backwards compatibility - cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die fi touch "${ED}${f}" || die chgrp gamestat "${ED}${f}" || die chmod g+w "${ED}${f}" || die done - - if [[ -d ${EROOT}/var/games && -z $(find "${EROOT}"/var/games \ - -maxdepth 0 -uid 0 -gid 0 -perm 755 -print) ]]; then - chown 0:0 "${EROOT}"/var/games || die - chmod 755 "${EROOT}"/var/games || die - fi - if has 1.4-r1 ${REPLACING_VERSIONS} \ - && [[ -d ${EROOT}/var/games/emacs ]]; then - elog "Updating owner and permissions of score file directory." - chown 0:gamestat "${EROOT}"/var/games/emacs || die - 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 }