summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-10-13 21:37:06 +0000
committerUlrich Müller <ulm@gentoo.org>2010-10-13 21:37:06 +0000
commiteb76b4039099c14866615cf3f1c7a8bb6b60f396 (patch)
treeaf4bfe2d6d809d7e9cc1df5f07d08b6e0a4830de /app-editors/emacs-vcs
parenttidy (diff)
downloadhistorical-eb76b4039099c14866615cf3f1c7a8bb6b60f396.tar.gz
historical-eb76b4039099c14866615cf3f1c7a8bb6b60f396.tar.bz2
historical-eb76b4039099c14866615cf3f1c7a8bb6b60f396.zip
Create .keepinfodir file to prevent portage from rebuilding the Info dir,
bug 257260. Package-Manager: portage-2.1.9.16/cvs/Linux x86_64
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r--app-editors/emacs-vcs/ChangeLog5
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild4
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild4
3 files changed, 7 insertions, 6 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{,.*}