Don't install non-Lisp files in site-lisp.

Package-Manager: portage-2.1.3.19

7 files changed, 49 insertions, 75 deletions

diff --git a/app-emacs/nxml-mode/ChangeLog b/app-emacs/nxml-mode/ChangeLog
index 4c416a65cc0d..283d62527544 100644
--- a/app-emacs/nxml-mode/ChangeLog
+++ b/app-emacs/nxml-mode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/nxml-mode
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.26 2007/09/12 15:04:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.27 2007/11/23 15:19:18 ulm Exp $
+
+*nxml-mode-20041004-r3 (23 Nov 2007)
+
+  23 Nov 2007; Ulrich Mueller <ulm@gentoo.org> +files/50nxml-mode-gentoo.el,
+  -nxml-mode-20041004-r1.ebuild, -nxml-mode-20041004-r2.ebuild,
+  +nxml-mode-20041004-r3.ebuild:
+  Don't install non-Lisp files in site-lisp. Move site-init file from 80 to 50
+  since it depends on nothing else. Remove old.
 
   12 Sep 2007; Ulrich Mueller <ulm@gentoo.org>
   files/nxml-mode-xmlschema-xpath.patch:
diff --git a/app-emacs/nxml-mode/Manifest b/app-emacs/nxml-mode/Manifest
index e716f2c06ac2..e33a8dccbfc0 100644
--- a/app-emacs/nxml-mode/Manifest
+++ b/app-emacs/nxml-mode/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 50nxml-mode-gentoo.el 411 RMD160 915c20d4e60a4fe056366ee79cda78c92adb6c5c SHA1 e7882f78736462ade5f859015e293e724cf8e9b7 SHA256 ebc321ac252722dd2c98ec5e0e2f26df74b8271f73da4a236904d04a89baf242
+MD5 b664691c235e77e3ba85985f89c86b3c files/50nxml-mode-gentoo.el 411
+RMD160 915c20d4e60a4fe056366ee79cda78c92adb6c5c files/50nxml-mode-gentoo.el 411
+SHA256 ebc321ac252722dd2c98ec5e0e2f26df74b8271f73da4a236904d04a89baf242 files/50nxml-mode-gentoo.el 411
 AUX 80nxml-mode-gentoo.el 226 RMD160 bdb8e7fbbd58679e029acb6630d30bfcfbb346be SHA1 602e2e7e8634b347c2c27a3b926f1db378766899 SHA256 79e3bc35ca62c8b77fd3bb35777263a82f0a7d6a9fb8b874c53106568a7a64fc
 MD5 ca04cb4a463ca0758093963bbba71e02 files/80nxml-mode-gentoo.el 226
 RMD160 bdb8e7fbbd58679e029acb6630d30bfcfbb346be files/80nxml-mode-gentoo.el 226
@@ -19,22 +23,18 @@ RMD160 b9e2d5873377365898218bbc8887553d699ff5ac files/xsd-regexp.el.2006-01-26.p
 SHA256 b2bb3df2b735ffef1ca7409af8231cba8b163e6a3b8ab7c88f77aa1d0773dcd6 files/xsd-regexp.el.2006-01-26.patch 768
 DIST nxml-mode-20040910-xmlschema.patch.gz 9069 RMD160 59091172e8544cb52fee7d3f44c353fdd6d78584 SHA1 4a0b5935aa4a6b73b52d63c152c8072c6e2828c1 SHA256 66be83896133c7d7e2debd275edb90527b87425bd8c05cf415c905520bc04914
 DIST nxml-mode-20041004.tar.gz 443020 RMD160 37188e12507eea2b24c6ad99c4930c8fe0660e79 SHA1 5d21ca111957f86c9c237af9161f7ca482a1ef9f SHA256 8cf71922962b134e08c4ad9048cd66e85c8297372f14dd1f1ada2d26c69c62ae
-EBUILD nxml-mode-20041004-r1.ebuild 1294 RMD160 da9ccca48c8c23a3a96f1bbc2e275cddc02c7795 SHA1 ac4da8d991ac2742f3f6c5db46a4a40cd358f234 SHA256 21ae05098b4868d4118e71254fb808bc3f11dbc196cc341f028f4ba2347a92de
-MD5 a771449a3fd27cc7072252cd372200eb nxml-mode-20041004-r1.ebuild 1294
-RMD160 da9ccca48c8c23a3a96f1bbc2e275cddc02c7795 nxml-mode-20041004-r1.ebuild 1294
-SHA256 21ae05098b4868d4118e71254fb808bc3f11dbc196cc341f028f4ba2347a92de nxml-mode-20041004-r1.ebuild 1294
-EBUILD nxml-mode-20041004-r2.ebuild 1359 RMD160 36b509ca59cacaefed5b3ea5b7f1af1190c5daef SHA1 eae131650a605bf4aad9cf763dd0f6e76eb15410 SHA256 ec2d92af7c7af313e498f1b8359699f608d005d6e7265acd46c3e3aadfbbc47a
-MD5 1aa1b2ac8018c2f6069a1c291220023d nxml-mode-20041004-r2.ebuild 1359
-RMD160 36b509ca59cacaefed5b3ea5b7f1af1190c5daef nxml-mode-20041004-r2.ebuild 1359
-SHA256 ec2d92af7c7af313e498f1b8359699f608d005d6e7265acd46c3e3aadfbbc47a nxml-mode-20041004-r2.ebuild 1359
+EBUILD nxml-mode-20041004-r3.ebuild 1499 RMD160 385a773145d484f7addc7dc11c024f115345f13b SHA1 a82d77dda0947524ffaa21b22e77b52aaa4a1c7c SHA256 d1c156798172a1a9dd7a323ccf75eb3a62469c94c9d4869db4401cba32d40ebb
+MD5 85079a3712c01783d0917ac12c4fb1ef nxml-mode-20041004-r3.ebuild 1499
+RMD160 385a773145d484f7addc7dc11c024f115345f13b nxml-mode-20041004-r3.ebuild 1499
+SHA256 d1c156798172a1a9dd7a323ccf75eb3a62469c94c9d4869db4401cba32d40ebb nxml-mode-20041004-r3.ebuild 1499
 EBUILD nxml-mode-20041004.ebuild 1150 RMD160 58d8299568f0526c1e3edcf9bb2293937cb08c54 SHA1 8dd050f794b724c7b59a8dd73cc4566db0cc7832 SHA256 5a123f7a49f3545d7b5d881cf7e07f9a15a5a034c88171dc99375638ddcf7170
 MD5 89d970ada02ea32ac8f060360a902d19 nxml-mode-20041004.ebuild 1150
 RMD160 58d8299568f0526c1e3edcf9bb2293937cb08c54 nxml-mode-20041004.ebuild 1150
 SHA256 5a123f7a49f3545d7b5d881cf7e07f9a15a5a034c88171dc99375638ddcf7170 nxml-mode-20041004.ebuild 1150
-MISC ChangeLog 3784 RMD160 66f9b82cbdd3998431165a12cf2f6054ad1c093a SHA1 c49683782ba329c95dffa4ad6ae93028f540c88e SHA256 7458c0054a2c3e612950b6f113d66120c5f47104f7b485e890f62a8327134feb
-MD5 85b90a43de49dd21ab997f295c21eab3 ChangeLog 3784
-RMD160 66f9b82cbdd3998431165a12cf2f6054ad1c093a ChangeLog 3784
-SHA256 7458c0054a2c3e612950b6f113d66120c5f47104f7b485e890f62a8327134feb ChangeLog 3784
+MISC ChangeLog 4124 RMD160 d32e7292c7060c04d9bd859240cf9a50c60dd425 SHA1 51476c8f12624ea35711b174bc98cbc48c1349a6 SHA256 5918c36735428ab7e167015c60de7959f846bab357616807d6051469717f83b1
+MD5 93472df311cf272a228eb3b695e284f1 ChangeLog 4124
+RMD160 d32e7292c7060c04d9bd859240cf9a50c60dd425 ChangeLog 4124
+SHA256 5918c36735428ab7e167015c60de7959f846bab357616807d6051469717f83b1 ChangeLog 4124
 MISC metadata.xml 420 RMD160 5b5de5a4392980dacfad737f6e4dae478317ecef SHA1 4abf6b71618f34d7358329761a18f741cbd151e1 SHA256 81071efdca44f52f577f8c0b698e54546d95b84240602b946e41aba3b869af32
 MD5 103177d81841ac7a82af69df80b2fa31 metadata.xml 420
 RMD160 5b5de5a4392980dacfad737f6e4dae478317ecef metadata.xml 420
@@ -42,16 +42,13 @@ SHA256 81071efdca44f52f577f8c0b698e54546d95b84240602b946e41aba3b869af32 metadata
 MD5 0c9c877fbadb86ff85070dd9c27b0a87 files/digest-nxml-mode-20041004 542
 RMD160 971c83ab6f33dcd7a83ed016426f1c87bbf257b9 files/digest-nxml-mode-20041004 542
 SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/digest-nxml-mode-20041004 542
-MD5 0c9c877fbadb86ff85070dd9c27b0a87 files/digest-nxml-mode-20041004-r1 542
-RMD160 971c83ab6f33dcd7a83ed016426f1c87bbf257b9 files/digest-nxml-mode-20041004-r1 542
-SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/digest-nxml-mode-20041004-r1 542
-MD5 0c9c877fbadb86ff85070dd9c27b0a87 files/digest-nxml-mode-20041004-r2 542
-RMD160 971c83ab6f33dcd7a83ed016426f1c87bbf257b9 files/digest-nxml-mode-20041004-r2 542
-SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/digest-nxml-mode-20041004-r2 542
+MD5 0c9c877fbadb86ff85070dd9c27b0a87 files/digest-nxml-mode-20041004-r3 542
+RMD160 971c83ab6f33dcd7a83ed016426f1c87bbf257b9 files/digest-nxml-mode-20041004-r3 542
+SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/digest-nxml-mode-20041004-r3 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHB+flOeoy/oIi7uwRAlZYAKCxQVja+9qOwpPvJTbfaGu1/8VzKgCgvtPt
-4HXmXA1KZVsmdeziLxmL3QQ=
-=co9V
+iD8DBQFHRu+OOeoy/oIi7uwRAoJdAJ0YuOd5bT2DzYYsEln+oaUvtDWbywCdE/tE
+Jtik/+v47Jlnib6lOv5S9LY=
+=PKZ5
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el b/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
new file mode 100644
index 000000000000..b3027dc62147
--- /dev/null
+++ b/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; nxml site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(load "rng-auto" nil t)
+
+(setq rng-schema-locating-files-default
+      '("schemas.xml" "/usr/share/emacs/etc/nxml-mode/schema/schemas.xml")
+      rng-schema-locating-file-schema-file
+      "/usr/share/emacs/etc/nxml-mode/schema/locate.rnc")
+
+(add-to-list 'auto-mode-alist
+	     '("\\.\\(xml\\|xsl\\|xsd\\|rng\\|xhtml\\)\\'" . nxml-mode))
diff --git a/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r2 b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r2
deleted file mode 100644
index 431875c7937a..000000000000
--- a/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d98a6a37ad177f89698561416dc1195c nxml-mode-20040910-xmlschema.patch.gz 9069
-RMD160 59091172e8544cb52fee7d3f44c353fdd6d78584 nxml-mode-20040910-xmlschema.patch.gz 9069
-SHA256 66be83896133c7d7e2debd275edb90527b87425bd8c05cf415c905520bc04914 nxml-mode-20040910-xmlschema.patch.gz 9069
-MD5 ac137024cf337d6f11d8ab278d39b4db nxml-mode-20041004.tar.gz 443020
-RMD160 37188e12507eea2b24c6ad99c4930c8fe0660e79 nxml-mode-20041004.tar.gz 443020
-SHA256 8cf71922962b134e08c4ad9048cd66e85c8297372f14dd1f1ada2d26c69c62ae nxml-mode-20041004.tar.gz 443020
diff --git a/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r1 b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r3
index 431875c7937a..431875c7937a 100644
--- a/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r1
+++ b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r3
diff --git a/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild b/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild
deleted file mode 100644
index fbe40d1a5674..000000000000
--- a/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild,v 1.1 2007/08/15 07:37:56 ulm Exp $
-
-inherit elisp eutils
-
-DESCRIPTION="A major mode for GNU Emacs for editing XML documents."
-HOMEPAGE="http://www.thaiopensource.com/nxml-mode/
-http://www.emacswiki.org/cgi-bin/wiki/NxmlMode"
-SRC_URI="http://thaiopensource.com/download/${P}.tar.gz
-	mirror://gentoo/${PN}-20040910-xmlschema.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-SITEFILE=80${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-info-gentoo.patch"
-	epatch "${WORKDIR}/${PN}-20040910-xmlschema.patch"
-	epatch "${FILESDIR}/xsd-regexp.el.2006-01-26.patch"		# bug #188112
-}
-
-src_compile() {
-	emacs -batch -l rng-auto.el -f rng-byte-compile-load \
-		|| die "byte compilation failed"
-	makeinfo --force nxml-mode.texi || die "makeinfo failed"
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	cp -r "${S}/schema" "${D}/${SITELISP}/${PN}"
-	cp -r "${S}/char-name" "${D}/${SITELISP}/${PN}"
-	doinfo nxml-mode.info
-	dodoc README VERSION TODO NEWS || die "dodoc failed"
-}
diff --git a/app-emacs/nxml-mode/nxml-mode-20041004-r2.ebuild b/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
index 1a578cab5ce7..97323fd784bb 100644
--- a/app-emacs/nxml-mode/nxml-mode-20041004-r2.ebuild
+++ b/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r2.ebuild,v 1.1 2007/09/09 10:00:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild,v 1.1 2007/11/23 15:19:18 ulm Exp $
 
 inherit elisp eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-SITEFILE=80${PN}-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
@@ -33,10 +33,13 @@ src_compile() {
 }
 
 src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	cp -r "${S}/schema" "${D}/${SITELISP}/${PN}"
-	cp -r "${S}/char-name" "${D}/${SITELISP}/${PN}"
+	elisp-install ${PN} *.el *.elc || die "elisp-install failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "elisp-site-file-install failed"
+	insinto ${SITELISP}/${PN}
+	doins -r char-name || die "doins char-name failed"
+	insinto /usr/share/emacs/etc/${PN}
+	doins -r schema || die "doins schema failed"
 	doinfo nxml-mode.info
 	dodoc README VERSION TODO NEWS || die "dodoc failed"
 }