Allow for emacs-23 providing nxml-mode, and add a message to pkg_postinst.

Package-Manager: portage-2.1.4.4

diff --git a/app-emacs/nxml-gentoo-schemas/ChangeLog b/app-emacs/nxml-gentoo-schemas/ChangeLog
index 05644b3156b85a079b530d8231dc421ebe85d28a..3b4b45c56a192893bb4f404b05dc15116c2e82b7 100644 (file)
--- 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/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index dd440895260a2961658a7d16974a3a54ec6a3504..100566d9c26fc64dce4cd51d6da980da3d07553a 100644 (file)
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX 60nxml-gentoo-schemas-gentoo.el 256 RMD160 9017f6769079363f65ceb9fa9a2a3627db64d242 SHA1 0ab03958e67de8814eeaf45b4498f4fd2161c760 SHA256 a71492c07211d155244a8d1810f5dbd07472d44841f9d526bce3a8583837a7ae
 DIST nxml-gentoo-schemas-20080301.tar.bz2 10535 RMD160 fb7cf15157799175e0c774bf491fc43131a0f23d SHA1 8092665b326b0d28d3ed73a93a5a4ba23d779c1f SHA256 d42078f0e971f18cc03d76fd14008f0e3427b77a8a317fdd7dae129b6ff86ba9
-EBUILD nxml-gentoo-schemas-20080301.ebuild 758 RMD160 2363341851deae602863a02000b3a289c7ad618e SHA1 91c1d16cc990c9f04f3496dc0acd67b0a60ee529 SHA256 a5d65bfe65364282b35e1e51d1c40a52af8085e37d1f0f74ccd7bf0e0a0ba0d6
-MISC ChangeLog 3185 RMD160 380482363c9deab221e8702ba553871289931727 SHA1 a515a47a968f929054315c010d0c4bfca3d619df SHA256 6926ce7b028cbd016646c0d75fa3f23d8ca90dfb0baa7d3968a7479ab1ee488f
+EBUILD nxml-gentoo-schemas-20080301.ebuild 1065 RMD160 e6e2199b3858860ace9696c4c8a2b079fa2fa3f5 SHA1 29fb8421c06096351fc036ca64021d4f4682b7de SHA256 e8568f89c9375517db65eae7fe84b9b998550e51c607910d40850837b31dc8e3
+MISC ChangeLog 3349 RMD160 cd1ac3f2e0782e1660d6f66e159201bb075c1d0c SHA1 631f1b3d8aa1640dc7be1529b2f6b998cab85bf5 SHA256 36cf9e1a7717b7ba90dd498ba3d4a72cbedd4fa5b0162a98ed551b0f3e51f1f6
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAkfIqwEACgkQOeoy/oIi7uxS3gCfYhq6JBsvcwjbrw3V13n4QPk5
-268Anjc5B1yeCDjyEtO3KZ7SAloO2mHp
-=MrfZ
+iEYEARECAAYFAkfJZEEACgkQOeoy/oIi7uxytgCfZUptl6zUEgQkwq/FcYDaWZuw
+BfYAoOvSJHFZNR/xQvKwITD5x7Z2Hy02
+=tELl
 -----END PGP SIGNATURE-----

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 b5efd6d2c497e7bf71fac5a1a0d6d26fa085ca62..02578a426fdf817df26e162e9b7a74ecc83a3f9c 100644 (file)
--- 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
+}