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 ACEAD138247 for ; Wed, 13 Nov 2013 09:47:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1180CE0B17; Wed, 13 Nov 2013 09:47:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D692E0B17 for ; Wed, 13 Nov 2013 09:47:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44DF633F2A6 for ; Wed, 13 Nov 2013 09:47:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 06E11E530A for ; Wed, 13 Nov 2013 09:47:39 +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: <1384336127.a9d1eb636d5c5d016f9daab7113520a97f469361.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: a9d1eb636d5c5d016f9daab7113520a97f469361 X-VCS-Branch: master Date: Wed, 13 Nov 2013 09:47:39 +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: f3af6e6d-d581-478e-8a37-b02fca03e2f0 X-Archives-Hash: 964b23f22dbf2f2831bc81e33efe5c95 commit: a9d1eb636d5c5d016f9daab7113520a97f469361 Author: Ulrich Müller gentoo org> AuthorDate: Wed Nov 13 09:48:47 2013 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Nov 13 09:48:47 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a9d1eb63 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 --- app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++ .../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 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 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