Don't rename GNU Info files, bug 306445.

(Portage version: 2.1.9.14/cvs/Linux x86_64)

4 files changed, 46 insertions, 34 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 108774c9532b..356cee769844 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,15 @@
 # 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.388 2010/10/11 21:59:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.389 2010/10/12 20:02:58 ulm Exp $
+
+*emacs-23.2-r2 (12 Oct 2010)
+*emacs-22.3-r6 (12 Oct 2010)
+*emacs-21.4-r22 (12 Oct 2010)
+
+  12 Oct 2010; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r21.ebuild,
+  +emacs-21.4-r22.ebuild, -emacs-22.3-r5.ebuild, +emacs-22.3-r6.ebuild,
+  -emacs-23.2-r1.ebuild, +emacs-23.2-r2.ebuild:
+  Don't rename GNU Info files, bug 306445.
 
   11 Oct 2010; Christian Faulhammer <fauli@gentoo.org> emacs-23.2.ebuild,
   emacs-23.2-r1.ebuild:
diff --git a/app-editors/emacs/emacs-21.4-r21.ebuild b/app-editors/emacs/emacs-21.4-r22.ebuild
index 60deb7bef185..033443266b6b 100644
--- a/app-editors/emacs/emacs-21.4-r21.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-r21.ebuild,v 1.3 2010/10/10 17:13:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.1 2010/10/12 20:02:58 ulm Exp $
 
 EAPI=2
 
@@ -120,16 +120,15 @@ src_install() {
 	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
 	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
 
-	# move info documentation to the correct place
-	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
-		mv "${i}" "${i}.info" || die "mv ${i} failed"
-	done
-
 	# move man pages to the correct place
 	for m in "${D}"/usr/share/man/man1/* ; do
 		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
 	done
 
+	# 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"
+
 	# avoid collision between slots
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
 
@@ -146,15 +145,17 @@ 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-${SLOT} 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{,.*}
-		for f in "${D}"${infodir}/*.info*; do
-			[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-				&& install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+		for f in "${D}"${infodir}/*; do
+			if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then
+				install-info --info-dir="${D}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
 		done
 	fi
 }
diff --git a/app-editors/emacs/emacs-22.3-r5.ebuild b/app-editors/emacs/emacs-22.3-r6.ebuild
index f8f1bab3cbbc..df97754b673e 100644
--- a/app-editors/emacs/emacs-22.3-r5.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-r5.ebuild,v 1.2 2010/10/10 17:13:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.1 2010/10/12 20:02:58 ulm Exp $
 
 EAPI=2
 
@@ -161,16 +161,15 @@ src_install () {
 	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
 		|| die "moving Emacs executable failed"
 
-	# move info documentation to the correct place
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv "${i}" "${i}.info" || die "mv info failed"
-	done
-
 	# 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 "${D}"/var/lib/games/emacs/{snake,tetris}-scores
@@ -212,15 +211,17 @@ 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{,.*}
-		for f in "${D}"${infodir}/*.info*; do
-			[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-				&& install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+		for f in "${D}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${D}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
 		done
 	fi
 }
diff --git a/app-editors/emacs/emacs-23.2-r1.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild
index ad007697661b..00695df9cb52 100644
--- a/app-editors/emacs/emacs-23.2-r1.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-r1.ebuild,v 1.3 2010/10/11 21:59:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.1 2010/10/12 20:02:58 ulm Exp $
 
 EAPI=2
 
@@ -215,16 +215,15 @@ src_install () {
 	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
 		|| die "moving Emacs executable failed"
 
-	# move info documentation to the correct place
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv "${i}" "${i}.info" || die "mv info failed"
-	done
-
 	# 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}
@@ -267,15 +266,17 @@ 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{,.*}
-		for f in "${D}"${infodir}/*.info*; do
-			[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-				&& install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+		for f in "${D}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${D}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
 		done
 	fi
 }