Restore fallback code in pkg_preinst because of failures with paludis.

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

3 files changed, 34 insertions, 19 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index e1e5c3d1440b..b1f721cdaf3e 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.459 2012/01/06 21:15:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.460 2012/01/08 21:20:57 ulm Exp $
+
+  08 Jan 2012; Ulrich Müller <ulm@gentoo.org> emacs-23.3-r3.ebuild:
+  Restore fallback code in pkg_preinst because of failures with paludis.
 
   06 Jan 2012; Ulrich Mueller <ulm@gentoo.org> -emacs-23.3-r1.ebuild:
   Remove old.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 1126883689e9..2cad735dc9b2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,23 +18,23 @@ EBUILD emacs-21.4-r24.ebuild 5241 RMD160 70117c0c7a53e2ffe4b8a03e913ba84c408889e
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-22.3-r9.ebuild 7985 RMD160 01594bd1319b9a671374ffab8bdbdaee8d105013 SHA1 e39dea23803b36ca9c64bfe8600cdd6b8169825e SHA256 e955fa03e9c33411301b1b24559669319a5a5397d113f6c01e6a78cc81f1d14a
 EBUILD emacs-23.3-r2.ebuild 10658 RMD160 63927365f7e2a728bba68b9fa3d3e83bf6733e56 SHA1 887baad945d4c248954fc6b7a9261a85184dca3d SHA256 4cd619f0697ba1a8f26c73e787f0b05a6ed258f99c513ed1fc4f107e65ff0342
-EBUILD emacs-23.3-r3.ebuild 10481 RMD160 626fe3cf524bfeec60bc676e4a176a3748695a72 SHA1 580d3ad9d18985aee0c3b79e003268253e394312 SHA256 509469ab61b087b6893d2ea3e19a664e427570fad2e9860d2fade2346a0891d8
-MISC ChangeLog 65582 RMD160 bc74af384bc268cb30c6f2809483f115242f63a6 SHA1 cc3c0c6fb1a8f52438adde5806fdf28741c9c371 SHA256 f30c0348c56b42a6432691c64de4366cd7d7edce506b762e0072abc2135a7035
+EBUILD emacs-23.3-r3.ebuild 10881 RMD160 1675df4892fbc1663a52818fad2dff626e217120 SHA1 d590b81d38ad39387cba9efceda5bf4feb014670 SHA256 2f6c1cc8a20df4e636717799dac7af7f69141fd60ec1d80cc90bac19a6844ded
+MISC ChangeLog 65725 RMD160 0ef13c6dc861cbc0434fa09b7e26c43e6bc84a17 SHA1 843b637e5834241318fc2d7a9f0dea667d0e4aa4 SHA256 375f88e5235d1645f1b933f10d58793ab089de3dfdd85217c158b2c744933c7a
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPB2R2AAoJEDxpGckxwJCBmoEP/2TZSyHaDM/z/tQuAxnKKxKM
-3/AZNbl1CcNMKesh3c7fXAHGm0raT8QJCSYCJmKyGvAv0PY4So/GGlM500fMdNCa
-fAOUBFggM/AB6kThTqDDFWHxlPhONCEtjpk298i68UeN7SFoxv/WN0zZiKXOcyMX
-6G+Tlw7VdifxjiHYNSK17oAX4RYdzeQDdONmr8R64XoB1WNx0vAksYvg/sXWwG8a
-ztR1pxaB+xSVAMMeIQLUtDMvsFjntqDrmYzL85dW5yRbTwdMhtwGpN3LDsE85l5l
-dZgxtgttK/wKMl8ALJ5HoIGGi7g+3KKRpWiMVigymfRoDce9kasKs1bOGimkTGbf
-8Fgx2LSj0A2V3nJGyeuINr5zWj9pkqK3mjhoAynMky1TmHvAvkuSilfSuYR9JfEZ
-twEv2ZDDkc5OhM0eTltYhMaOudMIyJBdxIhW5ZAVOyUvb+UuMVCHkmWsBIVRuSnM
-Lu7zELhLz0vYW0R97M7SthaRuy0rjY8np+s9WMHAkZ7WSZa/4w6MSil49PwjyUOi
-P3qxxTOv0d/05OIzr4SXW9Hcbsxyh5YAKRdZu7NvM8gYlZUcIM8UzpaDNPdHyaRj
-CnRwNSXEFyeKpjvDi5MYcqvG3IVSfIkcHHhBDQ8Hmp6MmHGIojDB/AYxPI1pCacY
-bGiZQ9VzvcsOig5imbcW
-=mqni
+iQIcBAEBAgAGBQJPCgjDAAoJEDxpGckxwJCBu+IP/1wrYWrfGXZNT+whL+KUOPje
+tUyrFTdTZp/18kIGk3OBc18LW3asn2QBzQc1W2gGB/OomIKZBXhgqE4K6QGgfII6
+2u446CM+TA49J/KUubm3yp23RNsvAX+rMWHJvpVka7tigs2V1Z0HKUe13M9bls7u
+MHrX68OZNDuqQJdPNvBJNDie/YQz5YFVytGO9B4F86TFoywZ7BajXuOu5L0aqdEz
+ymGcoagQDWkc16fXhMSK0XL8Y/lu1ULqLL5zZFKuHBbrhUBBjXeEPA/QfYfedS/B
+qNdfYNS7/NdeBV1kXQKsewft2mOqS6V7+uaULKRVOeZPSybK2n2C/Rw8hYLDX8aA
+A1R8GB5AAPsa5Wo0R7EvqOdFcMjU42bkZl7IrPdFY9/xthb3WzxQUokQgHzKArtB
+FWJ2OFi3iMPs5KF6kYx+H3bf7cs9qjs/hoSC0bAyiKMhsT2YSgQPaBd5xZW+P75O
+j3WEbZSxpduxdE/E5lkTumrHuonbg5Ikkfb4pDFZe1T2yziw3Mnf8RVv8B53nteR
+Nc31hvEkao2/ET+IudA4h8sv3L6sy3aHSKC+REZnS3dkv6addZU2WaXNJlh5jBSz
+92Nai6jmwxfM2ITYzKswzMnZdcsW8F84cZ/v7tpsk3XIup5IVU7N128291W8gnu4
+u4BiDggT+xhMBdzzqh14
+=wrBW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.3-r3.ebuild b/app-editors/emacs/emacs-23.3-r3.ebuild
index ff38533ef703..f57262bd4f57 100644
--- a/app-editors/emacs/emacs-23.3-r3.ebuild
+++ b/app-editors/emacs/emacs-23.3-r3.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.3-r3.ebuild,v 1.4 2012/01/05 23:51:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.5 2012/01/08 21:20:57 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -278,8 +278,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() {