Install files in etc directory, following nxml-mode.

(Portage version: 2.1.3.19)

4 files changed, 22 insertions, 18 deletions

diff --git a/app-emacs/nxml-gentoo-schemas/ChangeLog b/app-emacs/nxml-gentoo-schemas/ChangeLog
index 6d921478bdf6..92be07cedaac 100644
--- a/app-emacs/nxml-gentoo-schemas/ChangeLog
+++ b/app-emacs/nxml-gentoo-schemas/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/nxml-gentoo-schemas
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/ChangeLog,v 1.5 2007/11/22 15:24:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/ChangeLog,v 1.6 2007/11/23 15:49:10 ulm Exp $
+
+*nxml-gentoo-schemas-20071122-r1 (23 Nov 2007)
+
+  23 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
+  files/81nxml-gentoo-schemas-gentoo.el,
+  -nxml-gentoo-schemas-20071122.ebuild,
+  +nxml-gentoo-schemas-20071122-r1.ebuild:
+  Install files in etc directory, following nxml-mode. Inherit elisp.eclass
+  and remove now redundant pkg_postinst and pkg_postrm functions.
 
 *nxml-gentoo-schemas-20071122 (22 Nov 2007)
 
diff --git a/app-emacs/nxml-gentoo-schemas/files/81nxml-gentoo-schemas-gentoo.el b/app-emacs/nxml-gentoo-schemas/files/81nxml-gentoo-schemas-gentoo.el
index 77c583e5b20b..cae317749029 100644
--- a/app-emacs/nxml-gentoo-schemas/files/81nxml-gentoo-schemas-gentoo.el
+++ b/app-emacs/nxml-gentoo-schemas/files/81nxml-gentoo-schemas-gentoo.el
@@ -1,3 +1,7 @@
-;;; nxml-gentoo-schemas-configuration
 
-(add-to-list 'rng-schema-locating-files-default "@SITELISP@/schemas.xml")
+;;; nxml-gentoo-schemas site-lisp configuration
+
+;; This must come after the nxml-mode site initialisation,
+;; because rng-schema-locating-files-default is set there.
+(add-to-list 'rng-schema-locating-files-default
+	     "/usr/share/emacs/etc/nxml-gentoo-schemas/schemas.xml")
diff --git a/app-emacs/nxml-gentoo-schemas/files/digest-nxml-gentoo-schemas-20071122 b/app-emacs/nxml-gentoo-schemas/files/digest-nxml-gentoo-schemas-20071122-r1
index 29a8ca40cbcb..29a8ca40cbcb 100644
--- a/app-emacs/nxml-gentoo-schemas/files/digest-nxml-gentoo-schemas-20071122
+++ b/app-emacs/nxml-gentoo-schemas/files/digest-nxml-gentoo-schemas-20071122-r1
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20071122.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20071122-r1.ebuild
index 469cb5819b68..cbe28c5c85e9 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20071122.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20071122-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2007 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-20071122.ebuild,v 1.1 2007/11/22 15:24:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20071122-r1.ebuild,v 1.1 2007/11/23 15:49:10 ulm Exp $
 
-inherit elisp-common
+inherit elisp
 
 DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
 HOMEPAGE="http://farragut.flameeyes.is-a-geek.org/"
-
 SRC_URI="http://flameeyes.is-a-geek.org/files/${P}.tar.bz2"
 
 LICENSE="as-is"
@@ -16,20 +15,12 @@ IUSE=""
 
 RDEPEND="app-emacs/nxml-mode"
 
-SITEFILE=81nxml-gentoo-schemas-gentoo.el
+SITEFILE=81${PN}-gentoo.el
 
 src_compile() { :; }
 
 src_install() {
-	insinto "${SITELISP}/${PN}"
-	doins schemas.xml *.rnc
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-}
-pkg_postrm() {
-	elisp-site-regen
+	insinto /usr/share/emacs/etc/${PN}
+	doins schemas.xml *.rnc || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 }