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

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

4 files changed, 11 insertions, 7 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index c75ac6e742a1..9cc0bd70b503 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.92 2012/05/17 09:26:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.93 2012/05/19 15:58:54 ulm Exp $
+
+  19 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.0.97.ebuild,
+  emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild:
+  Don't try to rebuild the Info dir file if /usr/share/info doesn't exist.
 
 *emacs-vcs-24.0.97 (17 May 2012)
 
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild
index 3c10a9ce5456..68307fb73959 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.97.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-vcs/emacs-vcs-24.0.97.ebuild,v 1.1 2012/05/17 09:26:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.2 2012/05/19 15:58:54 ulm Exp $
 
 EAPI=4
 
@@ -320,7 +320,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{,.*}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild
index dfebcac7139b..807d15abb8ea 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.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-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.3 2012/05/03 07:29:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
 
 EAPI=4
 
@@ -304,7 +304,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{,.*}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild
index 0c67af89545c..2d1241a68903 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.1.9999.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-vcs/emacs-vcs-24.1.9999.ebuild,v 1.3 2012/05/03 07:29:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
 
 EAPI=4
 
@@ -304,7 +304,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{,.*}