summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-07-06 19:39:41 +0200
committerUlrich Müller <ulm@gentoo.org>2013-07-06 19:39:41 +0200
commit7be5535359f96c81b08122c6a1a6075e8ebee540 (patch)
tree6b22bfbbdb122714d220a844cd0c6a21f0523895 /app-emacs
parentUnpack to eselect, not eselect-mode. (diff)
downloademacs-7be5535359f96c81b08122c6a1a6075e8ebee540.tar.gz
emacs-7be5535359f96c81b08122c6a1a6075e8ebee540.tar.bz2
emacs-7be5535359f96c81b08122c6a1a6075e8ebee540.zip
Update from Portage tree.
Package-Manager: portage-2.1.12.11
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/ebuild-mode/ChangeLog4
-rw-r--r--app-emacs/ebuild-mode/ebuild-mode-9999.ebuild24
-rw-r--r--app-emacs/ebuild-mode/files/50ebuild-mode-gentoo.el4
3 files changed, 10 insertions, 22 deletions
diff --git a/app-emacs/ebuild-mode/ChangeLog b/app-emacs/ebuild-mode/ChangeLog
index 7b3ca33..3412787 100644
--- a/app-emacs/ebuild-mode/ChangeLog
+++ b/app-emacs/ebuild-mode/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Jul 2013; Ulrich Müller <ulm@gentoo.org> ebuild-mode-9999.ebuild,
+ files/50ebuild-mode-gentoo.el:
+ Update from Portage tree.
+
*ebuild-mode-9999 (05 Jul 2013)
05 Jul 2013; Ulrich Müller <ulm@gentoo.org> +ebuild-mode-9999.ebuild,
diff --git a/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild b/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild
index 02e3fa9..25965aa 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/emacs-tools.git"
EGIT_BRANCH="${PN}"
-inherit elisp git-2
+inherit readme.gentoo elisp git-2
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
@@ -18,22 +18,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
S="${WORKDIR}/${PN}"
-DOCS="ChangeLog"
-SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog keyword-generation.sh"
ELISP_TEXINFO="${PN}.texi"
-
-src_install() {
- elisp-install ${PN} *.el *.elc
- sed -e "s:@PORTDIR@:${PORTDIR}:" \
- "${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" || die
- elisp-site-file-install "${T}/${SITEFILE}"
- doinfo ${PN}.info
- dodoc ${DOCS}
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- elog "Some optional features may require installation of additional"
- elog "packages, like app-portage/gentoolkit-dev for echangelog."
-}
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like app-portage/gentoolkit-dev for echangelog."
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo.el
index 643b384..44b3bdb 100644
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo.el
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo.el
@@ -10,6 +10,4 @@
'("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'"
. gentoo-newsitem-mode))
(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
-(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
-
-(setq ebuild-mode-portdir "@PORTDIR@")
+(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\|eblit\\)\\'" 'utf-8)