Don't rename GNU Info files, bug 306445.

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

4 files changed, 35 insertions, 29 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index e2ec7ccde08b..4e45fcd930a0 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2010/09/25 11:32:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.27 2010/10/10 10:39:30 ulm Exp $
+
+  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+  emacs-vcs-24.0.9999.ebuild:
+  Don't rename GNU Info files, bug 306445.
 
   25 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
   emacs-vcs-24.0.9999.ebuild:
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 24e32659f9c5..62d2d9af2244 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD emacs-vcs-23.2.9999.ebuild 9756 RMD160 c4d27e131d71cd8d5ee5d67ba201b59c62c8e1e3 SHA1 e2222f0c194d03c91e17100c9d64a9cb7e4b54ef SHA256 00ff786f21aa34d7a7d174af803abe6fe19215767e8986f8483f993804294a6e
-EBUILD emacs-vcs-24.0.9999.ebuild 10239 RMD160 06ae625f394dc5f87f289eaf70d63cd47e9b7d0b SHA1 8190a7f8dc3f05054e6f2a23d502aa0f01de7873 SHA256 8da3c5722d676ee852160d475d07e6901215bf8bce46f8655333064d57aa4621
-MISC ChangeLog 53765 RMD160 9ba1287ce6ab346e30502d69c32a1dc9f19a4069 SHA1 c0ed613edc59e35fc1bc6f22336e4d5340a211b5 SHA256 2c5207578de7752556b4504790db75d0a135af4e01e8f2554eb1c57977626700
+EBUILD emacs-vcs-23.2.9999.ebuild 9794 RMD160 b4f063bab6614e04d6057936a6ae4682cdfd223a SHA1 a9028ccab6d717b18a053ed34508dfcfe90f9d4b SHA256 e26a35b29a638270458b86bc22e65ca297a820243519adeff2e4ef72c5d340b7
+EBUILD emacs-vcs-24.0.9999.ebuild 10277 RMD160 87b30345bf64a6a2f6af892471823455b5ca3bbd SHA1 895d74f364eda6547480fe09d9af6a720868b813 SHA256 d6eff1f8969a84b3c7fb38e933425eabf97e72201203c2a967a03e11dd807c54
+MISC ChangeLog 53914 RMD160 c2a14ee74b7c0e6fc2a78ba6951d3fdeeea7fe7b SHA1 ad363d6f63d113d88710a48020a2408c5d12f54e SHA256 9e5997e574addc5a96cd0584c4167d1556a5a97d4dfea35653b61dd4210511ed
 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyd3j0ACgkQOeoy/oIi7uzHMwCeLkkmOEiIXZnr9sddw6drjU3H
-y/EAnjzPwFdOIkDRFWp57X1tQHM2DHeJ
-=/GqM
+iEYEARECAAYFAkyxmFYACgkQOeoy/oIi7uwMLACffRlFVX5A9fT+dZzMoHq7VzK/
+IiEAoOqrhO8zgGH+xFqrf4W/YWXMlNZw
+=yECa
 -----END PGP SIGNATURE-----
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 b255e544e26f..332a1ec7d563 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.3 2010/09/25 11:32:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.4 2010/10/10 10:39:30 ulm Exp $
 
 EAPI=2
 
@@ -212,16 +212,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}
@@ -264,15 +263,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-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
index 982f2bf66525..ce56510cb9ab 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.12 2010/09/25 11:32:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.13 2010/10/10 10:39:30 ulm Exp $
 
 EAPI=2
 
@@ -225,16 +225,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}
@@ -277,15 +276,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
 }