Restore fallback code in pkg_preinst because of failures with paludis.

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

6 files changed, 84 insertions, 31 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/Manifest b/app-editors/emacs-vcs/Manifest
index e3dc19ba49a8..abe3a64937a1 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,26 +3,26 @@ Hash: SHA1
 
 DIST emacs-24.0.91.tar.gz 50973768 RMD160 6479b85929c98f18d7ffeb4d288677ee8d744a72 SHA1 7eda9e9861638cfc328582e27831ece799ba9929 SHA256 1850909dccde9a331b4585bdc3d26a30b90a81a7d2469536fddd6ba61d246bbe
 DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f
-EBUILD emacs-vcs-23.3.9999.ebuild 10716 RMD160 b30d54da550c40371a66ffc6c7b921c02bef078f SHA1 f95ef1791501967ecc45e4d42da59074f32df5d8 SHA256 f232e3862f65e910f48e86e0a6d8cb22faef5fc555f5c5e4b90d112b4fd1d3cf
-EBUILD emacs-vcs-24.0.91.ebuild 10908 RMD160 1843ea3413202525895cedbf5b2ec247627bdb50 SHA1 915b2faac203e34b112caf2ee9c800ab98be28a0 SHA256 39013b87715efbeae0f5a6b1033aa34462f4a7805c8604bfb156d9b2832b919f
-EBUILD emacs-vcs-24.0.92.ebuild 10908 RMD160 06b2638a6405a56f0273fb70325702943abe1b3d SHA1 dbe12c6daa49c27cdf460b2eb6d0eb5162ea07f0 SHA256 1d3dcec4fa4be394d2ed325c210be6b2177f09baceddf648a4735e65c89bdecb
-EBUILD emacs-vcs-24.0.9999-r2.ebuild 10913 RMD160 f559410763e9f52f922c93054e2f858deb778ca3 SHA1 ec9b050683c2af59828e15afcd76db9c29a15ac6 SHA256 8d0102a1c98d021c2ca45e3e719eb580fba9df6f97573bfce32a6a852dffcb40
-MISC ChangeLog 62047 RMD160 a25b3cdaf846fa5acbf4a043ce997a0d88191687 SHA1 f96b7da544b249fd931b86d952206e85d4afd39e SHA256 d9cbce442fd974c50555d213b1fac5959afacf40daade110a6e6f40214e254dc
+EBUILD emacs-vcs-23.3.9999.ebuild 11116 RMD160 d4f7cd8356737a5c46e371cb8674868e186d4d04 SHA1 0fadef60e83367020763324d993288b6a1a429f1 SHA256 0364eb960acfbafcb125fe18440fc93b36822ed77660b28e91bc191cac9c684b
+EBUILD emacs-vcs-24.0.91.ebuild 11308 RMD160 e41075102e1437a8beb7581cd6b2a93554ecc6b8 SHA1 99942948f61c0322d21d9ba78e5c66918d0b1f4c SHA256 8cbd55760c3a0367997863f5f281c89c092bc4bea4d2c58acc8b5f98a14e1c86
+EBUILD emacs-vcs-24.0.92.ebuild 11308 RMD160 1222d455d2ca58ccc1ad89954fde96bd04f160cc SHA1 f99c4cb48ad452e04fc0eebc15ed24aee5ba88b5 SHA256 4a86e573e9cac5aacb02d17d92df53fab8c9e59f71d827cc944a5dea70d7e956
+EBUILD emacs-vcs-24.0.9999-r2.ebuild 11313 RMD160 414f80889d67e8ce1ac231ad7d9b16fb56ebd02f SHA1 82657b77cd5d245463694738672b0efdafa0e31d SHA256 c5b50094ad4cbaab866342737d92f0df3b828be387f3fd7c01a4e0c67e464040
+MISC ChangeLog 62283 RMD160 82ed8bf5ce26ccbc5c5c5c69fbddaea0c4848a4b SHA1 9b9e02d30b69ede9400155dd01b6fae7b127daf5 SHA256 0f1324fdec6987848a4dae699e3477d1e72fe6c8504a7796336d9b1eef86acc7
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPBjg9AAoJEDxpGckxwJCBjiwQAJkLKsfKyxJeGmTX04fbBO72
-gy9FGtxhIb881yVFLydugWWw2/SixkswcSaNXJeEOB68/J+dPHKtFc1govig1U4f
-6nvq5kXhD3GYgupP7cvZ/0NEshBDv6oerLUOcI86M5DW/9r+Nsvd5I5RW8FD9yDq
-7G04Ya2zJyPvoW6SfoNjadjfef3d7gviCxpdzpKgtz8XXPp2d6dKqD6lw0TZrYGP
-yMZ2v+3LjSKE/jhGF3190opX6HIXtMRCypLy2b+d+Sg6yj+sby5iSLqE7MBkERKH
-CTPhniP+8W6IR93VramZ/LaZ6I/h2jkvgsr1Q7NuAADJDUR1aw+/fvZZZH7gOZW/
-jnQXeNCEeXFAhwIUmpbsUCcpYmm/dD9gDDjXfqmTqRkIUCMvatOdONRpe80jl5J2
-ydGHatIeaS1AzRsS4RfH/DGaIOGyNqxIzTkBx5Ws3Tg8WPhveo5fq+7RMygaxeGH
-2zwzCvyb6Fl+kWrmiIEzVedyujp4eqysUYf7VoDgo4mVoKX4rWXWCZMvN5cN/PKU
-g538dfyKIq4EkXBlpVrl2IU1SXt8gStN2DJcOysfHbyTYG0rscX7+vTyZgG3OTMq
-/l4WAHKLLGsThz1vMK/vLUpoXsscfsMDV1r74AxjfGkWHVLeAbp5ZBS1clxYiLdv
-adm91VUCclIRDZGj5t6d
-=rZvV
+iQIcBAEBAgAGBQJPCgrGAAoJEDxpGckxwJCBWOAP+gJ+xAKpqCTlDkBHHemm42bx
+fm9g121Mjg5t1S1Cfahk+MWgS0SNoBW33jUu7b9g3PAUeU3jUyrBoDNHR2s5xCCC
+2DwDIZsjpLltutu1DuCricUqfLffrvM+TGi0cJONqpbcPSnuUyWdjkVw8jejMaTi
+8YUIC7KoZxNxP8HcSWwtBxEDW760PsFMBtPusV935RpwJZddYgRAuiNctZiURz3P
+hHI61C0xzoH/0M+SxghhVKMiPVNukn+HC9GWEkmShNJcQpiNGxK94V2XT3bhOEKP
+f1vfy8lEypF57qhPY5vFLkyciGRzlfYGqy3R4Ppyue7LAnGB1y/c9/uAcpusgyqv
+5BVh5wayy1KkUOi+0uagmWcHnDfjOdPUEPED7oy5Yaz+3NoVn1s2uXoDP4NLRiwV
+xbqDl8yYEC6wmv424rwP/ziVkYlgAguO6187Ji75C8KG2TCbB5tzh5PCnV+3P4IJ
+BYeh4siHfo08fp5NkLPzrFuf4he64B5IB+H5F7lBvNwcnYlh99CFKmVygmvEjQY4
+H+z3ba6hlKXwk3I2jAweANk5WyuQICf3M4mz+MqDRtM04ZWMewMIN3GKMU2jRszG
+0Op7cx2TU1b+nRV2DCpesI/9QcHphdHvRJt9UqFGMhapUW/dZljGes9qZKdTJlj2
+4n3rPoOsbXCx4tm3OLTd
+=KajQ
 -----END PGP SIGNATURE-----
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() {