summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-10 21:42:27 +0000
committerUlrich Müller <ulm@gentoo.org>2013-03-10 21:42:27 +0000
commit0346eaf090d44ec64f719119b5bf70f503d52e3a (patch)
tree5bd14f5d2c46f024a02fc77f4f2eb60f2dd263f0 /app-emacs
parentVersion bump. (diff)
downloadgentoo-2-0346eaf090d44ec64f719119b5bf70f503d52e3a.tar.gz
gentoo-2-0346eaf090d44ec64f719119b5bf70f503d52e3a.tar.bz2
gentoo-2-0346eaf090d44ec64f719119b5bf70f503d52e3a.zip
Use functions from readme.gentoo.eclass instead of elog.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/emacs-common-gentoo/ChangeLog8
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild36
2 files changed, 22 insertions, 22 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 2211bbb169f4..7dd6db9902ec 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/emacs-common-gentoo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.81 2012/09/02 18:27:16 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.82 2013/03/10 21:42:27 ulm Exp $
+
+ 10 Mar 2013; Ulrich Müller <ulm@gentoo.org>
+ emacs-common-gentoo-1.3-r3.ebuild:
+ Use functions from readme.gentoo.eclass instead of elog.
02 Sep 2012; Ulrich Müller <ulm@gentoo.org>
-emacs-common-gentoo-1.3-r1.ebuild, metadata.xml:
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
index 6f8a1445e569..b0ab60293b14 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3-r3.ebuild,v 1.8 2012/09/02 17:55:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild,v 1.9 2013/03/10 21:42:27 ulm Exp $
EAPI=4
-inherit elisp-common eutils fdo-mime gnome2-utils user
+inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo user
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
@@ -58,6 +58,18 @@ src_install() {
gnome2_icon_savelist
fi
+
+ DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+ added to ${SITELISP}/site-gentoo.el. In order for this site
+ initialisation to be loaded for all users automatically, a default
+ site startup file /etc/emacs/site-start.el is installed. You are
+ responsible for maintenance of this file.
+ \n\nAlternatively, individual users can add the following command:
+ \n\n(require 'site-gentoo)
+ \n\nto their ~/.emacs initialisation files, or, for greater
+ flexibility, users may load single package-specific initialisation
+ files from the ${SITELISP}/site-gentoo.d/ directory."
+ readme.gentoo_create_doc
}
site-start-modified-p() {
@@ -96,25 +108,9 @@ pkg_postinst() {
# make sure that site-gentoo.el exists since site-start.el requires it
elisp-site-regen
- local line
- while read line; do elog "${line:- }"; done <<-EOF
- All site initialisation for Gentoo-installed packages is added to
- ${SITELISP}/site-gentoo.el. In order for this site
- initialisation to be loaded for all users automatically, a default
- site startup file /etc/emacs/site-start.el is installed. You are
- responsible for maintenance of this file.
-
- Alternatively, individual users can add the following command:
-
- (require 'site-gentoo)
-
- to their ~/.emacs initialisation files, or, for greater flexibility,
- users may load single package-specific initialisation files from
- ${SITELISP}/site-gentoo.d/.
- EOF
+ readme.gentoo_print_elog
if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
- elog
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