Add site initialisation for Info.

svn path=/emacs-overlay/; revision=1227

3 files changed, 32 insertions, 10 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 528e1bb..68cb35d 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Add site initialisation for Info, so that Emacs' own Info dir is always
+  first in the list. This also helps to get the right documentation if Emacs
+  is explicitely started as emacs-${SLOT}. Move site-init file from 10 to 20
+  since emacs-daemon should be first.
+
   26 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
   Correct name for split Info files. Handle the FEATURES=noinfo case in
   emacs-infodir-rebuild; don't create a spurious Info dir file when called
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 7113f50..3604e2b 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,4 +1,4 @@
 AUX emacs-cvs-freebsd-sparc-1.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8
-EBUILD emacs-cvs-23.0.9999.ebuild 8646 RMD160 a65947145aa5dbcd039c70a5bbfd1f1524c43a77 SHA1 8a1a5b60c1ff6d66b6b1ada554c69c4831a20d6d SHA256 f9cb1b5b48bc4d54201bf19b6655ffc37547ce9b1813a6410bc2e90e5b32d741
-MISC ChangeLog 1167 RMD160 7c046f50e40fc349ff983ebdaa702789fe9be42d SHA1 c778dd1ab14c35b892525592925cd510c6c5a8aa SHA256 be245d20990133a51b85bb62ff9aa07c1a8cb4dcdedca912c491a6e1cce57887
+EBUILD emacs-cvs-23.0.9999.ebuild 9049 RMD160 31bad034259de435b626e97df8a0a7203a908b1e SHA1 c2cb3e264bc2cc07bd52d1ca9ef143452263ce6e SHA256 22f4aff232c51a9e8d29d375977a3defa2be3ad2a15861ec072eaa19f99e617c
+MISC ChangeLog 1509 RMD160 197dfc236caf7126ce10452d63cd2537e399b3ad SHA1 6e9e0f4b60eb0d247f9ea721b1d193a9953017ef SHA256 947df93a383e8bf5b0fb2e04f1133cb45d43fc3e67eaef86aff3e70ac3d1c505
 MISC metadata.xml 1606 RMD160 f898da13dfc3bdb1636e9ff7bc241997d235498b SHA1 2dea9901bc80a1d91f38628707395d9b4ef0df70 SHA256 f4df95b7db6f7b3375bdd658024520a03a763e75f4ca846ab494609f6094c9bd
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
index d2cbccf..b958f8e 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${ECVS_LOCALNAME}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE=20${PN}-${SLOT}-gentoo.el
 
 src_prepare() {
 	# FULL_VERSION keeps the full version number, which is needed in
@@ -189,6 +190,7 @@ src_compile() {
 }
 
 src_install () {
+	local infodir=/usr/share/info/${EMACS_SUFFIX}
 	local i ii m
 
 	emake install DESTDIR="${D}" || die "make install failed"
@@ -199,7 +201,7 @@ src_install () {
 		|| die "moving Emacs executable failed"
 
 	# move info documentation to the correct place and fix indirect list
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
+	for i in "${D}"${infodir}/*; do
 		ii=$(echo "${i}" | sed 's/\(-[0-9]\+\)\?$/.info&/')
 		mv "${i}" "${ii}" || die "mv info failed"
 		[[ ${ii} == *.info ]] \
@@ -223,16 +225,30 @@ src_install () {
 		# This is not meant to install all the source -- just the
 		# C source you might find via find-function
 		doins src/*.[ch]
-		sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
+	fi
 
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
+	sed 's/^X//' >"${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	EOF
+	if use source; then
+		sed 's/^X//' >>"${SITEFILE}" <<-EOF
+		X  (setq find-function-C-source-directory
+		X	"/usr/share/emacs/${FULL_VERSION}/src")
 		EOF
-		elisp-site-file-install 10${PN}-${SLOT}-gentoo.el
 	fi
+	sed 's/^X//' >>"${SITEFILE}" <<-EOF
+	X  (let ((infopath (getenv "INFOPATH"))
+	X	(infodir "${infodir}"))
+	X    (and infopath
+	X	 ;; move Emacs Info dir to beginning of list
+	X	 (setq Info-directory-list
+	X	       (cons infodir
+	X		     (delete infodir (split-string infopath ":" t)))))))
+	EOF
+	elisp-site-file-install "${SITEFILE}" || die
 
 	dodoc README BUGS || die "dodoc failed"
 }