7 files changed, 19 insertions, 13 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index ce77fa2d00e3..e982006a0458 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,10 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.30 2010/10/13 14:41:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.31 2010/10/13 21:36:09 ulm Exp $
 
   13 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
   emacs-vcs-24.0.9999.ebuild:
-  Update timestamp of Info dir file.
+  Create .keepinfodir file to prevent portage from rebuilding the Info dir,
+  bug 257260.
 
   11 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
   emacs-vcs-23.2.9999.ebuild, emacs-vcs-24.0.9999.ebuild:
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
index 18ae8caaf543..8c8806077369 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.2.9999.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-vcs/emacs-vcs-23.2.9999.ebuild,v 1.7 2010/10/13 14:41:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.8 2010/10/13 21:36:09 ulm Exp $
 
 EAPI=2
 
@@ -220,6 +220,7 @@ src_install () {
 	# 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"
+	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -266,7 +267,6 @@ pkg_preinst() {
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-		touch "${D}"${infodir}/dir
 	else
 		einfo "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
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 7bab570c77e9..2abc028339a3 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.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-vcs/emacs-vcs-24.0.9999.ebuild,v 1.16 2010/10/13 14:41:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.17 2010/10/13 21:36:09 ulm Exp $
 
 EAPI=2
 
@@ -233,6 +233,7 @@ src_install () {
 	# 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"
+	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -279,7 +280,6 @@ pkg_preinst() {
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-		touch "${D}"${infodir}/dir
 	else
 		einfo "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 356cee769844..0ed0d5b4f0d2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.389 2010/10/12 20:02:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.390 2010/10/13 21:37:06 ulm Exp $
+
+  13 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r22.ebuild,
+  emacs-22.3-r6.ebuild, emacs-23.2-r2.ebuild:
+  Create .keepinfodir file to prevent portage from rebuilding the Info dir,
+  bug 257260.
 
 *emacs-23.2-r2 (12 Oct 2010)
 *emacs-22.3-r6 (12 Oct 2010)
diff --git a/app-editors/emacs/emacs-21.4-r22.ebuild b/app-editors/emacs/emacs-21.4-r22.ebuild
index 546573fc49db..e67f1c4888ec 100644
--- a/app-editors/emacs/emacs-21.4-r22.ebuild
+++ b/app-editors/emacs/emacs-21.4-r22.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-r22.ebuild,v 1.2 2010/10/13 14:41:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.3 2010/10/13 21:37:06 ulm Exp $
 
 EAPI=2
 
@@ -128,6 +128,7 @@ src_install() {
 	# move info dir to avoid collisions with the dir file generated by portage
 	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \
 		|| die "moving info dir failed"
+	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
 
 	# avoid collision between slots
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -148,7 +149,6 @@ pkg_preinst() {
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-		touch "${D}"${infodir}/dir
 	else
 		einfo "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
diff --git a/app-editors/emacs/emacs-22.3-r6.ebuild b/app-editors/emacs/emacs-22.3-r6.ebuild
index a6376710d10e..c0352626c804 100644
--- a/app-editors/emacs/emacs-22.3-r6.ebuild
+++ b/app-editors/emacs/emacs-22.3-r6.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-22.3-r6.ebuild,v 1.2 2010/10/13 14:41:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.3 2010/10/13 21:37:06 ulm Exp $
 
 EAPI=2
 
@@ -169,6 +169,7 @@ src_install () {
 	# 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"
+	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -214,7 +215,6 @@ pkg_preinst() {
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-		touch "${D}"${infodir}/dir
 	else
 		einfo "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild
index ca0a7e0a9902..74e187260434 100644
--- a/app-editors/emacs/emacs-23.2-r2.ebuild
+++ b/app-editors/emacs/emacs-23.2-r2.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-23.2-r2.ebuild,v 1.2 2010/10/13 14:41:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.3 2010/10/13 21:37:06 ulm Exp $
 
 EAPI=2
 
@@ -223,6 +223,7 @@ src_install () {
 	# 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"
+	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -269,7 +270,6 @@ pkg_preinst() {
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-		touch "${D}"${infodir}/dir
 	else
 		einfo "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}