Rename dir file to dir.orig.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
index 5d32226..f1f0743 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
@@ -225,15 +225,15 @@ src_install () {
 	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
 		|| die "moving Emacs executable failed"
 
-	# move info dir to avoid file collisions
-	mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.info} \
-		|| die "moving info dir failed"
-
 	# move man pages to the correct place
 	for m in "${D}"/usr/share/man/man1/* ; do
 		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
 	done
 
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${D}"/usr/share/{applications,icons}
@@ -276,9 +276,9 @@ pkg_preinst() {
 	# Depending on Portage version and user's settings, the Info dir file
 	# may have been compressed or removed. We rebuild it in both cases.
 	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [ -f "${D}"${infodir}/dir.info ]; then
+	if [ -f "${D}"${infodir}/dir.orig ]; then
 		# prefer existing file if it has survived to here
-		mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
+		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
 	else
 		einfo "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}