diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-03-01 14:13:54 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-03-01 14:13:54 +0000 |
commit | 785574bb2cc35df7cb06b0b3d2f494575f85506b (patch) | |
tree | 218b1d6af9ab4ac3e79e7fdf5b6b1b8c8def9e20 /app-emacs | |
parent | Stable on amd64, bug #210986 (diff) | |
download | gentoo-2-785574bb2cc35df7cb06b0b3d2f494575f85506b.tar.gz gentoo-2-785574bb2cc35df7cb06b0b3d2f494575f85506b.tar.bz2 gentoo-2-785574bb2cc35df7cb06b0b3d2f494575f85506b.zip |
Allow for emacs-23 providing nxml-mode, and add a message to pkg_postinst.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-emacs')
-rw-r--r-- | app-emacs/nxml-gentoo-schemas/ChangeLog | 6 | ||||
-rw-r--r-- | app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/app-emacs/nxml-gentoo-schemas/ChangeLog b/app-emacs/nxml-gentoo-schemas/ChangeLog index 05644b3156b8..3b4b45c56a19 100644 --- a/app-emacs/nxml-gentoo-schemas/ChangeLog +++ b/app-emacs/nxml-gentoo-schemas/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emacs/nxml-gentoo-schemas # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/ChangeLog,v 1.13 2008/03/01 01:03:25 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/ChangeLog,v 1.14 2008/03/01 14:13:54 ulm Exp $ + + 01 Mar 2008; Ulrich Mueller <ulm@gentoo.org> + nxml-gentoo-schemas-20080301.ebuild: + Allow for emacs-23 providing nxml-mode, and add a message to pkg_postinst. 01 Mar 2008; Ulrich Mueller <ulm@gentoo.org> files/60nxml-gentoo-schemas-gentoo.el: diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild index b5efd6d2c497..02578a426fdf 100644 --- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild +++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild,v 1.1 2008/03/01 00:22:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20080301.ebuild,v 1.2 2008/03/01 14:13:54 ulm Exp $ inherit elisp @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" IUSE="" -RDEPEND=">=app-emacs/nxml-mode-20041004-r3" +RDEPEND="|| ( >=app-emacs/nxml-mode-20041004-r3 >=virtual/emacs-23 )" SITEFILE=60${PN}-gentoo.el @@ -25,3 +25,13 @@ src_install() { elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die dodoc DONATING } + +pkg_postinst () { + elisp-site-regen + + if [ $(emacs -batch -q --eval "(princ (fboundp 'nxml-mode))") = nil ]; then + ewarn "This package needs nxml-mode. You should either install" + ewarn "app-emacs/nxml-mode, or use \"eselect emacs\" to select" + ewarn "an Emacs version >= 23." + fi +} |