Restore fallback code in pkg_preinst because of failures with paludis.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

5 files changed, 66 insertions, 13 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index bf29a3e07437..0bf70bdd48b0 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.73 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.74 2012/01/08 21:29:32 ulm Exp $
+
+  08 Jan 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+  emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
+  emacs-vcs-24.0.9999-r2.ebuild:
+  Restore fallback code in pkg_preinst because of failures with paludis.
 
   05 Jan 2012; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
   emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
index bc6a061cdd6a..82e52ce47782 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.3.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-23.3.9999.ebuild,v 1.18 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.19 2012/01/08 21:29:32 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -293,8 +293,20 @@ src_install () {
 
 pkg_preinst() {
 	# move Info dir file to correct name
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
-		|| die "moving info dir failed"
+	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
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
index 7a6e1a478d00..c434cd35e30b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.91.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.91.ebuild,v 1.7 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.8 2012/01/08 21:29:32 ulm Exp $
 
 EAPI=4
 
@@ -300,8 +300,20 @@ src_install () {
 
 pkg_preinst() {
 	# move Info dir file to correct name
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
-		|| die "moving info dir failed"
+	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
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
index eabcdb4ec7a3..0919d899510b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.92.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.92.ebuild,v 1.5 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.6 2012/01/08 21:29:32 ulm Exp $
 
 EAPI=4
 
@@ -300,8 +300,20 @@ src_install () {
 
 pkg_preinst() {
 	# move Info dir file to correct name
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
-		|| die "moving info dir failed"
+	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
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
index e07b46ee549f..7b58a9da7040 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.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-r2.ebuild,v 1.3 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.4 2012/01/08 21:29:32 ulm Exp $
 
 EAPI=4
 
@@ -300,8 +300,20 @@ src_install () {
 
 pkg_preinst() {
 	# move Info dir file to correct name
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
-		|| die "moving info dir failed"
+	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
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
 }
 
 pkg_postinst() {