Fix path for installation of Info dir.

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

3 files changed, 15 insertions, 15 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 599d6e3d118a..adccd05e5a53 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.385 2010/09/25 13:55:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.386 2010/10/10 15:10:24 ulm Exp $
+
+  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r21.ebuild:
+  Fix path for installation of Info dir.
 
 *emacs-23.2-r1 (25 Sep 2010)
 *emacs-22.3-r5 (25 Sep 2010)
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 786c60fe4252..b494064ecb03 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -19,7 +19,7 @@ DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SH
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-21.4-r19.ebuild 5249 RMD160 37948b5917237c6ca7b148e6d36c5f10c9c6b205 SHA1 2f04b39e2e332b0b701beaeddfb941972b2e4e88 SHA256 8527a478c88151caf7b95fd799034c3f9d8f163bf55998c6d5a57ef7b14be59d
 EBUILD emacs-21.4-r20.ebuild 5254 RMD160 79cb19669457876717a95abacc9800f8fce254a9 SHA1 68cdb24bdca6d67f697d715c439e01bf9fb0d867 SHA256 03861e56a897a6ea932017b841148807e97e02020b6dd9888882dc7b491d648e
-EBUILD emacs-21.4-r21.ebuild 5166 RMD160 d1e281bdfd4fd6e0c42392426a27e215c9aca8e9 SHA1 f09617a7a9269d9d0f3730d587cee731f419c2d7 SHA256 e9ed7f4c6a5248716e24bc2133ce5b24e0302f38d060c1780517f705dfbebaa4
+EBUILD emacs-21.4-r21.ebuild 5067 RMD160 3186ac0554dde59b9f289511227647fb9aacf2a9 SHA1 259da5f36cc069c7e53822230c8e74c77b07ce24 SHA256 d73e73e3a00157550e4fad61c5a4b4eccd3b04025f4579f8af6fc4341df3cca4
 EBUILD emacs-22.3-r3.ebuild 7833 RMD160 c9f82bfcff4c7408ee5f579f43ab9a3f7d56bdec SHA1 0f7e8ed4eae680ef56306ce6eb372113a3d8cb27 SHA256 c193c8947ba893368dbf06c9781d8d466b434854c42f37e0028c3577734c2bcb
 EBUILD emacs-22.3-r4.ebuild 7877 RMD160 ea5ba611c7143f72e3bc65b2bc2a62bbfdd640f9 SHA1 a2f9ec0affc3e017a870afafac84efb9f0865968 SHA256 afc0879134a1cf37ebfc533755b31a0b417fe24cbabbbe1dc48ab9f3f1fb46e7
 EBUILD emacs-22.3-r5.ebuild 7855 RMD160 146f3d7a41f6fe6b64badb2c83f029020e273ada SHA1 4438b4bf2b242d62d4298c987aa98a5078f8a299 SHA256 06ba667c002b4fd520f88fb345cb4fbf7c77d84da5e05a6eaecc5d06f8319657
@@ -27,12 +27,12 @@ EBUILD emacs-23.1-r2.ebuild 9712 RMD160 be850522adf821e720b9539012b2fe0987d11170
 EBUILD emacs-23.1-r3.ebuild 9789 RMD160 8fd4054a53fef7c6f7f85c209dbc021c4591fa0b SHA1 2b90519e8e6f820595e03cd0a970301d91539263 SHA256 d945bf0f26489d68181aa63e8304660561f9a8f08b92fe0c5a9a8920eef88328
 EBUILD emacs-23.2-r1.ebuild 9813 RMD160 5fd9c9a6da79a5aa80a2e562d3af480c63de8d32 SHA1 a9dacd1237ec8b3cc8d47127fbc6f9b2b11b8ddc SHA256 6ce260005cc39dc93d3c1d192dc61e4040f4440a76a1d0cd076e12266370f344
 EBUILD emacs-23.2.ebuild 9903 RMD160 2b40997933d0dba59da566719ab634a3ffeedf96 SHA1 d309a5c99c274b7a1e5117117b084c57cf627fcc SHA256 d4916117be6caa456ae9c8e268ee1a332abcd5ff634c75a11817c76551e49a90
-MISC ChangeLog 54652 RMD160 7d5f46aa60517d232cdd1ec19eebb902dc43b805 SHA1 2a73ad125bd03a10f2b7a155e7381dc0cb4b1c9f SHA256 9f125f49c602029d6d2577aa58f6ab4f34b605c039548ec9f5cd5253cb6d6fcd
+MISC ChangeLog 54764 RMD160 d6c7b73a0382747c66101852f13313534c80267e SHA1 0e365b4b84fe42d77b94700f6fa035e4695930db SHA256 4984b99ec7d1c31632269080e3ce0e04466fec1b847ae2a62f7150e15b329901
 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyd/7kACgkQOeoy/oIi7uxezQCfaefKAa4OTKW+7mC1M6Eg9z9S
-YJkAmwbuteCmo4hA4sfa9u5L+kLqVtRl
-=h2sR
+iEYEARECAAYFAkyx19QACgkQOeoy/oIi7uyoaQCfX9T8KOh0fPPhufZGM7wqWlgx
+WuwAoKAOz70nR6I/cq1gSw2fAf9u4u7I
+=eAsk
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r21.ebuild b/app-editors/emacs/emacs-21.4-r21.ebuild
index f77c6122e05a..893b76fa6ee0 100644
--- a/app-editors/emacs/emacs-21.4-r21.ebuild
+++ b/app-editors/emacs/emacs-21.4-r21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.1 2010/09/25 13:55:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.2 2010/10/10 15:10:24 ulm Exp $
 
 EAPI=2
 
@@ -111,7 +111,9 @@ src_compile() {
 src_install() {
 	local i m
 
-	einstall || die "einstall failed"
+	einstall infodir="${D}/usr/share/info/emacs-${SLOT}" \
+		|| die "einstall failed"
+
 	for i in "${D}"/usr/bin/* ; do
 		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
 	done
@@ -119,14 +121,9 @@ src_install() {
 	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
 
 	# move info documentation to the correct place
-	mkdir "${T}/emacs-${SLOT}"
-	mv "${D}/usr/share/info/dir" "${T}"
-	for i in "${D}"/usr/share/info/*
-	do
-		mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv "${i}" "${i}.info" || die "mv ${i} failed"
 	done
-	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
-	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
 
 	# move man pages to the correct place
 	for m in "${D}"/usr/share/man/man1/* ; do