Install files in etc directory, following nxml-mode.

Package-Manager: portage-2.1.3.19

5 files changed, 41 insertions, 37 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/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index f4e866fb1c5d..cececc2e4fc4 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 81nxml-gentoo-schemas-gentoo.el 113 RMD160 f3ff33140488782f849d48d269718ed75f142228 SHA1 dc2d6582dfcdea5650ea88a612c4c84d4c0e8643 SHA256 0aa315c2aab6032ffbda3f3dffe5b45ee22e11599eca526c4a8cdf38bf93c407
-MD5 3c6e4f1de628603cd8e9a0a16807b96c files/81nxml-gentoo-schemas-gentoo.el 113
-RMD160 f3ff33140488782f849d48d269718ed75f142228 files/81nxml-gentoo-schemas-gentoo.el 113
-SHA256 0aa315c2aab6032ffbda3f3dffe5b45ee22e11599eca526c4a8cdf38bf93c407 files/81nxml-gentoo-schemas-gentoo.el 113
+AUX 81nxml-gentoo-schemas-gentoo.el 278 RMD160 864dbb23f1a93941ca7665c70b4850e18ce518e5 SHA1 ee0b15af0efb8dd10c3b772c6a066b0f0c0200a3 SHA256 04286d7f9ed59e21dca8c212384b1552278f8b39e52f29fa0b6843af44803ef6
+MD5 6780b996d0fa7bd97cdc1b5653dd8933 files/81nxml-gentoo-schemas-gentoo.el 278
+RMD160 864dbb23f1a93941ca7665c70b4850e18ce518e5 files/81nxml-gentoo-schemas-gentoo.el 278
+SHA256 04286d7f9ed59e21dca8c212384b1552278f8b39e52f29fa0b6843af44803ef6 files/81nxml-gentoo-schemas-gentoo.el 278
 DIST nxml-gentoo-schemas-20071122.tar.bz2 9618 RMD160 500d2bbbbdf214446371342d1e1fc959e2a0297e SHA1 501feebcef384cacacc1530294042449fd7438c1 SHA256 7ece2d275b1b4c54e5b57e1aac99df819a1b778c389087cd6af4de892756aad2
-EBUILD nxml-gentoo-schemas-20071122.ebuild 818 RMD160 13c838fe8ff67aa2edae66877e97cc8241e7ae4e SHA1 e6f0fcdc1d7385845eed42025f7475fc612edb30 SHA256 4b6ac3cbf72b51e19669c93b6b255504901a2509d6923333e00f522ae4d283c1
-MD5 a6248c29ceee6003ecf43e919b507eb8 nxml-gentoo-schemas-20071122.ebuild 818
-RMD160 13c838fe8ff67aa2edae66877e97cc8241e7ae4e nxml-gentoo-schemas-20071122.ebuild 818
-SHA256 4b6ac3cbf72b51e19669c93b6b255504901a2509d6923333e00f522ae4d283c1 nxml-gentoo-schemas-20071122.ebuild 818
-MISC ChangeLog 1695 RMD160 ca986ce1db0ffcf77360bc0e4994c8c7fb8317b7 SHA1 7b1da41f0b2d887cd9de4cf864abc4b6a1f437de SHA256 6ea4edeb80de5a4817753e1ced078b14d0f501085c4b20048bcf304d85961ca7
-MD5 cb54229a84323e74172ec1cca7a9d865 ChangeLog 1695
-RMD160 ca986ce1db0ffcf77360bc0e4994c8c7fb8317b7 ChangeLog 1695
-SHA256 6ea4edeb80de5a4817753e1ced078b14d0f501085c4b20048bcf304d85961ca7 ChangeLog 1695
+EBUILD nxml-gentoo-schemas-20071122-r1.ebuild 740 RMD160 88a65b82e67639a7a8e7f469de1a9e5ed89c85e6 SHA1 df42de770b2e256629d11662a9ce6825818aaf9e SHA256 75d8595793064992d7d69627a9737e379e544b0036f3ef01fea7144d413d41b8
+MD5 79cdc0f5148abd1a80a769e998ae9bc3 nxml-gentoo-schemas-20071122-r1.ebuild 740
+RMD160 88a65b82e67639a7a8e7f469de1a9e5ed89c85e6 nxml-gentoo-schemas-20071122-r1.ebuild 740
+SHA256 75d8595793064992d7d69627a9737e379e544b0036f3ef01fea7144d413d41b8 nxml-gentoo-schemas-20071122-r1.ebuild 740
+MISC ChangeLog 2051 RMD160 8160fc043d5d3fc0efb3fd96ba0519f9ef5d8c3e SHA1 3b10e33560803d570bf79aad15a04ef192c62f41 SHA256 4f1afd759a49955955c8b5d8eb15a1402ac8dd232b3d07af32540b721c07939c
+MD5 3a395f01f88955db6e76bf958fc6b1cf ChangeLog 2051
+RMD160 8160fc043d5d3fc0efb3fd96ba0519f9ef5d8c3e ChangeLog 2051
+SHA256 4f1afd759a49955955c8b5d8eb15a1402ac8dd232b3d07af32540b721c07939c ChangeLog 2051
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 a50caccadcaaca8f47f13edd035eda08 files/digest-nxml-gentoo-schemas-20071122 283
-RMD160 a4ca3e1287a939b2f96c4f01d3d770d8db9b8ae9 files/digest-nxml-gentoo-schemas-20071122 283
-SHA256 d65055a7fa984f217810cd9cd782d8a94bb959e2ed7ac15a666af879a42297dd files/digest-nxml-gentoo-schemas-20071122 283
+MD5 a50caccadcaaca8f47f13edd035eda08 files/digest-nxml-gentoo-schemas-20071122-r1 283
+RMD160 a4ca3e1287a939b2f96c4f01d3d770d8db9b8ae9 files/digest-nxml-gentoo-schemas-20071122-r1 283
+SHA256 d65055a7fa984f217810cd9cd782d8a94bb959e2ed7ac15a666af879a42297dd files/digest-nxml-gentoo-schemas-20071122-r1 283
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHRZ4aAiZjviIA2XgRAmd8AKDYxxLVBcxGuo79asCbMn3W5Y408gCgz2SF
-DGbdBLp09nWFKSY5dbmmj4k=
-=AGqo
+iD8DBQFHRvaNOeoy/oIi7uwRAhppAJ0Y1HDmId0WRqRnVDDSkIPX1UArHACdEBXe
+vfgxuQodvzgfP8Ndye278dE=
+=rmr8
 -----END PGP SIGNATURE-----
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
 }