diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-10-13 21:37:06 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-10-13 21:37:06 +0000 |
| commit | eb76b4039099c14866615cf3f1c7a8bb6b60f396 (patch) | |
| tree | af4bfe2d6d809d7e9cc1df5f07d08b6e0a4830de /app-editors/emacs | |
| parent | tidy (diff) | |
| download | historical-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')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r22.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-22.3-r6.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-23.2-r2.ebuild | 4 |
4 files changed, 12 insertions, 7 deletions
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{,.*} |