Don't try to rebuild the Info dir file if /usr/share/info doesn't exist.

(Portage version: 2.1.10.62/cvs/Linux x86_64)

5 files changed, 15 insertions, 9 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 0e0dc760ccce..1c39e96d06d2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.486 2012/05/09 01:44:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.487 2012/05/19 15:58:11 ulm Exp $
+
+  19 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild,
+  emacs-21.4-r24.ebuild, emacs-22.3-r9.ebuild, emacs-23.4-r1.ebuild:
+  Don't try to rebuild the Info dir file if /usr/share/info doesn't exist.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> emacs-23.4-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index dbbe5ce31c8b..d2b5027cb970 100644
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.4 2012/01/04 17:30:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.5 2012/05/19 15:58:11 ulm Exp $
 
 EAPI=4
 
@@ -123,7 +123,9 @@ src_install() {
 
 pkg_preinst() {
 	# move Info dir file to correct name
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
+	if [[ -d "${D}"/usr/share/info ]]; then
+		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
+	fi
 
 	# remove symlink and directory installed by -r6 and earlier
 	if [[ -L "${ROOT}"/usr/share/info/emacs-${SLOT} ]]; then
diff --git a/app-editors/emacs/emacs-21.4-r24.ebuild b/app-editors/emacs/emacs-21.4-r24.ebuild
index 07705c926408..e528a926a506 100644
--- a/app-editors/emacs/emacs-21.4-r24.ebuild
+++ b/app-editors/emacs/emacs-21.4-r24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 1.2 2012/04/30 16:44:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 1.3 2012/05/19 15:58:11 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -157,7 +157,7 @@ pkg_preinst() {
 	local infodir=/usr/share/info/emacs-${SLOT} f
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	else
+	elif [[ -d "${D}"${infodir} ]]; then
 		# this should not happen in EAPI 4
 		ewarn "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
diff --git a/app-editors/emacs/emacs-22.3-r9.ebuild b/app-editors/emacs/emacs-22.3-r9.ebuild
index 073e2012285c..0afda51e8286 100644
--- a/app-editors/emacs/emacs-22.3-r9.ebuild
+++ b/app-editors/emacs/emacs-22.3-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild,v 1.3 2012/05/03 07:25:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r9.ebuild,v 1.4 2012/05/19 15:58:11 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -214,7 +214,7 @@ pkg_preinst() {
 	local infodir=/usr/share/info/${EMACS_SUFFIX} f
 	if [ -f "${D}"${infodir}/dir.orig ]; then
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	else
+	elif [[ -d "${D}"${infodir} ]]; then
 		# this should not happen in EAPI 4
 		ewarn "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
diff --git a/app-editors/emacs/emacs-23.4-r1.ebuild b/app-editors/emacs/emacs-23.4-r1.ebuild
index 25fcb4d90a46..d1d162b625b4 100644
--- a/app-editors/emacs/emacs-23.4-r1.ebuild
+++ b/app-editors/emacs/emacs-23.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild,v 1.11 2012/05/09 01:44:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild,v 1.12 2012/05/19 15:58:11 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -279,7 +279,7 @@ pkg_preinst() {
 	local infodir=/usr/share/info/${EMACS_SUFFIX} f
 	if [[ -f ${ED}${infodir}/dir.orig ]]; then
 		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	else
+	elif [[ -d "${ED}"${infodir} ]]; then
 		# this should not happen in EAPI 4
 		ewarn "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${ED}"${infodir}/dir{,.*}