Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a

spurious Info dir file when called with no files in postrm phase.
Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r4 i686

4 files changed, 22 insertions, 15 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 142323a26527..3a6949141ae2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.286 2008/11/14 09:11:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.287 2008/11/26 21:11:49 ulm Exp $
+
+  26 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r17.ebuild,
+  emacs-22.3.ebuild:
+  Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a
+  spurious Info dir file when called with no files in postrm phase.
 
   14 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r5.ebuild:
   Require libX11 built with USE=-xcb.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7c3baa1fabad..e2165ff7411b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -21,15 +21,15 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r5.ebuild 2627 RMD160 b4e915335f20ecbe01b81b583d088866d99324a3 SHA1 2d4296592d5fba06a9984e037145a54f4bb472ae SHA256 49a6910b7ccbe2e7adc278cdc91fac55fb184c5ec10c2cb0b4730188b750bc6e
 EBUILD emacs-21.4-r15.ebuild 5251 RMD160 6cb3de4ad357b8982fbc64dd2cad6bc1ee3bcbe4 SHA1 76a2ba348fd5ac93dd326a9fedf77550dbb51464 SHA256 00a75f9804a8df387aafa4380dd5855ba6991b69e1a68a5965fd69614b677d73
-EBUILD emacs-21.4-r17.ebuild 5351 RMD160 cc8778d9b1c08774c4f6241f5d4043ddfc2f12db SHA1 f6431c378a38e8c154cb39ed4f9b6c078f3aede8 SHA256 35ec8245a8ab1b3fcfdb09d5ee3ad36770f68998039cb66e2a62a986bf51584e
+EBUILD emacs-21.4-r17.ebuild 5433 RMD160 5da8ea5cf7c1dca685eb767c086069e6fb006f75 SHA1 2bbb50a49d78cbf4d38448a06e5347d34d6b41ad SHA256 5165e106e2c421ef82144fe2256a4685bc86dd53d100c840b9f3dbd4f3d214ee
 EBUILD emacs-22.2-r3.ebuild 8196 RMD160 ecf047909794fd1ed3f26912de31febe6e5f600d SHA1 99a3dc7eae2347db5afe59159f427997509e15a5 SHA256 24ef32b3fd737117e814d46811796756d3cdfcc7ab7c075555b8c3796494e47f
-EBUILD emacs-22.3.ebuild 7659 RMD160 41632c4fc178d77d6a0f6924b95eb5a9e1b67e30 SHA1 e3618e0ef8e914999faf0e3067ec1bb4e22bac8b SHA256 86bef96bc528b9e3985bc4d224e7f0eb08c5eb95324e15aa97a36d87c7ab8898
-MISC ChangeLog 41177 RMD160 bbfc4c6fef31239aff32216a5081dce9dc51abfb SHA1 dd7f38df85a900d00f85e9655caa684dc6cc8aca SHA256 a7058d23fbb91c3a4c6a57617ad30d8f4b67128d48e346f572f6d96110b8d4e5
+EBUILD emacs-22.3.ebuild 7741 RMD160 e097d334d6f9abd1ab3e33eee9650a5a54fbce1f SHA1 825f8c7733180099eb76520f87c8b5c81bb87bb6 SHA256 f14ac1a184161d537b06b353ae6623461df56cbb51e51432038d5bc40ad73ee5
+MISC ChangeLog 41412 RMD160 1f899b108390bbc48745e05b93830c4efd321568 SHA1 3217c4aafd11951a5000a5ba0dc4e8bd8af9d655 SHA256 411b776dfc2c8bd01594530e8c4400bee86f2bc166c6d21ca9f4d6907b7db84f
 MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkkdQO8ACgkQOeoy/oIi7uyG3wCePwglN2p97JtIEKKFLlpVWVvz
-k3AAoKtF9mOTgGMOu8BxfjJjXHACgS5Q
-=CbXK
+iEYEARECAAYFAkktu70ACgkQOeoy/oIi7uz1BgCeKY5rRC4uHLNmpA0V0ZK8l6IN
+C+AAn3vW7KIwfUDaF39q0UsRWjMiw+hN
+=rTgF
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
index 1af6382f1e2b..886fb7334ae0 100644
--- a/app-editors/emacs/emacs-21.4-r17.ebuild
+++ b/app-editors/emacs/emacs-21.4-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.13 2008/11/07 08:43:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.14 2008/11/26 21:11:49 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -154,13 +154,14 @@ emacs-infodir-rebuild() {
 	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
 
 	local infodir=/usr/share/info/emacs-${SLOT} f
+	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
 	einfo "Regenerating Info directory index in ${infodir} ..."
 	rm -f "${ROOT}"${infodir}/dir{,.*}
 	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
+		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
+	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
 	echo
 }
 
diff --git a/app-editors/emacs/emacs-22.3.ebuild b/app-editors/emacs/emacs-22.3.ebuild
index 7959c853f104..acddba9d4502 100644
--- a/app-editors/emacs/emacs-22.3.ebuild
+++ b/app-editors/emacs/emacs-22.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.12 2008/11/07 08:43:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.13 2008/11/26 21:11:49 ulm Exp $
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -205,13 +205,14 @@ emacs-infodir-rebuild() {
 	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
 
 	local infodir=/usr/share/info/emacs-${SLOT} f
+	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
 	einfo "Regenerating Info directory index in ${infodir} ..."
 	rm -f "${ROOT}"${infodir}/dir{,.*}
 	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
+		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
+	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
 	echo
 }