Info rebuild moved to separate function.

svn path=/emacs-overlay/; revision=195

8 files changed, 95 insertions, 97 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 0cce4af..9dca6a9 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Info rebuild moved to separate function.
+
   28 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
   emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
   emacs-cvs-23.0.0-r4.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index fa724e6..168734b 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -11,22 +11,22 @@ MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475
 DIST emacs-22.0.96.tar.gz 37846686 RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c SHA1 e2942bdbf693a0814fcc3b34d5ae55765d5d4ad8 SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d
-EBUILD emacs-cvs-22.0.96.ebuild 7770 RMD160 4678317cf3fb80aab0b502e9000d6db455bceaba SHA1 2a8e2f477a997c17fa8fd7f9c54eb500c9ba6b80 SHA256 0c515f84f72ac534ec39995d90258f9318f508016bdc7da869d6fed8bb8ee4cd
-MD5 cc814509c323a544f378611882a7d98a emacs-cvs-22.0.96.ebuild 7770
-RMD160 4678317cf3fb80aab0b502e9000d6db455bceaba emacs-cvs-22.0.96.ebuild 7770
-SHA256 0c515f84f72ac534ec39995d90258f9318f508016bdc7da869d6fed8bb8ee4cd emacs-cvs-22.0.96.ebuild 7770
-EBUILD emacs-cvs-22.0.9999-r8.ebuild 8088 RMD160 c8a5322956be08790d80a44eb6f42d6cdcb30e2a SHA1 cfee3ee3e79618cb01c96f3872333fd7961c0a71 SHA256 1e48b288d7f890eb59f20572267d6bb497f1d7437da4db4a1ee0b8bd343afac8
-MD5 9c529d54380d23a14aa06ad0b360bddb emacs-cvs-22.0.9999-r8.ebuild 8088
-RMD160 c8a5322956be08790d80a44eb6f42d6cdcb30e2a emacs-cvs-22.0.9999-r8.ebuild 8088
-SHA256 1e48b288d7f890eb59f20572267d6bb497f1d7437da4db4a1ee0b8bd343afac8 emacs-cvs-22.0.9999-r8.ebuild 8088
-EBUILD emacs-cvs-23.0.0-r4.ebuild 8346 RMD160 359ed31339a37634d7bee8c05a64886b435e4b9a SHA1 f098a2b1480dadbcbaa60cd81240237ca67a2b26 SHA256 4dd1f0d708cb218d08f6b8f1542fabd7e73feaca3b1d70d62c615f2480896b6e
-MD5 cfca3df0775156f04458d85167ddc78b emacs-cvs-23.0.0-r4.ebuild 8346
-RMD160 359ed31339a37634d7bee8c05a64886b435e4b9a emacs-cvs-23.0.0-r4.ebuild 8346
-SHA256 4dd1f0d708cb218d08f6b8f1542fabd7e73feaca3b1d70d62c615f2480896b6e emacs-cvs-23.0.0-r4.ebuild 8346
-MISC ChangeLog 8224 RMD160 d5f3579d8be68cabdb6a63a07e912df0a986441a SHA1 d67e2870e80ff135b642a36c8857818314a22714 SHA256 dd5cb300ca69d48a9b1e183a49bb7afbe38922c8359bfdb58539ea035e7f91ae
-MD5 11dd8086c4babd7918f44d6e22077229 ChangeLog 8224
-RMD160 d5f3579d8be68cabdb6a63a07e912df0a986441a ChangeLog 8224
-SHA256 dd5cb300ca69d48a9b1e183a49bb7afbe38922c8359bfdb58539ea035e7f91ae ChangeLog 8224
+EBUILD emacs-cvs-22.0.96.ebuild 7684 RMD160 15591e699ab285477ee0b8f3d71997f1714b4194 SHA1 2ea11f5f4b6b1518eff99c260b2f58e7d62c479b SHA256 9f1455c373ee67f35c15682666e60e128c5f8de21fe27d3d61567d22526c5d00
+MD5 6d91a364dc46281cd4eea6a9df4309e5 emacs-cvs-22.0.96.ebuild 7684
+RMD160 15591e699ab285477ee0b8f3d71997f1714b4194 emacs-cvs-22.0.96.ebuild 7684
+SHA256 9f1455c373ee67f35c15682666e60e128c5f8de21fe27d3d61567d22526c5d00 emacs-cvs-22.0.96.ebuild 7684
+EBUILD emacs-cvs-22.0.9999-r8.ebuild 8002 RMD160 c21d854e299b31f63d2cfa5a1ba98ebc2ab424a0 SHA1 ca6d159acccb285a32a5efc3730005bb09f3a94a SHA256 6e4c90df4ecfede617d4f7be8ab65fb69dee07160b71e6ddc9d7a57c67e88a47
+MD5 dcf76f94a98e37d077859468ec9c6629 emacs-cvs-22.0.9999-r8.ebuild 8002
+RMD160 c21d854e299b31f63d2cfa5a1ba98ebc2ab424a0 emacs-cvs-22.0.9999-r8.ebuild 8002
+SHA256 6e4c90df4ecfede617d4f7be8ab65fb69dee07160b71e6ddc9d7a57c67e88a47 emacs-cvs-22.0.9999-r8.ebuild 8002
+EBUILD emacs-cvs-23.0.0-r4.ebuild 8260 RMD160 0668f4dbd4773a2d7f908e08d9b02586d3853f9d SHA1 fa959e28a4e66bac783e18179a4664779d207bbc SHA256 8795a67d87f5256f2124ae3cdce69e6c64ed50f79587d61625afbff65357507a
+MD5 0580e5db1304b6fb136697ee33ba9faa emacs-cvs-23.0.0-r4.ebuild 8260
+RMD160 0668f4dbd4773a2d7f908e08d9b02586d3853f9d emacs-cvs-23.0.0-r4.ebuild 8260
+SHA256 8795a67d87f5256f2124ae3cdce69e6c64ed50f79587d61625afbff65357507a emacs-cvs-23.0.0-r4.ebuild 8260
+MISC ChangeLog 8410 RMD160 099bfb5300406b683bc80e9389732e36985cdc37 SHA1 62b3d7de9e4e36b73e47825a495ed3512b2ea5a5 SHA256 25c9e33f99ab5d01b2f503f58904b02ae1e69127fd2aa81c5840446b2b39ee1b
+MD5 f8c877769d6806b5bf7dab430f9b5f1d ChangeLog 8410
+RMD160 099bfb5300406b683bc80e9389732e36985cdc37 ChangeLog 8410
+SHA256 25c9e33f99ab5d01b2f503f58904b02ae1e69127fd2aa81c5840446b2b39ee1b ChangeLog 8410
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild
index 08c4354..109f81f 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.96.ebuild
@@ -196,22 +196,27 @@ EOF
 	dodoc BUGS ChangeLog README
 }
 
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	elisp-site-regen
-
+emacs-infodir-rebuild() {
 	# Depending on the Portage version, the Info dir file is compressed
 	# or removed. It is only rebuilt by Portage if our directory is in
 	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	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=${infodir} ${f} &>/dev/null
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
 	done
+	echo
+}
 
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 
 	if use X; then
@@ -230,14 +235,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	elisp-site-regen
-
-	# Rebuild Info dir file.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${infodir} ${f} &>/dev/null
-	done
-
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 }
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r8.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r8.ebuild
index 6c881d8..2469607 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r8.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r8.ebuild
@@ -208,22 +208,27 @@ EOF
 	dodoc BUGS ChangeLog README
 }
 
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	elisp-site-regen
-
+emacs-infodir-rebuild() {
 	# Depending on the Portage version, the Info dir file is compressed
 	# or removed. It is only rebuilt by Portage if our directory is in
 	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	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=${infodir} ${f} &>/dev/null
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
 	done
+	echo
+}
 
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 
 	if use X; then
@@ -242,14 +247,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	elisp-site-regen
-
-	# Rebuild Info dir file.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${infodir} ${f} &>/dev/null
-	done
-
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 }
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r4.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r4.ebuild
index 278e4ba..18ab5af 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r4.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r4.ebuild
@@ -213,22 +213,27 @@ EOF
 	dodoc BUGS ChangeLog README
 }
 
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	elisp-site-regen
-
+emacs-infodir-rebuild() {
 	# Depending on the Portage version, the Info dir file is compressed
 	# or removed. It is only rebuilt by Portage if our directory is in
 	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	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=${infodir} ${f} &>/dev/null
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
 	done
+	echo
+}
 
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 
 	if use X; then
@@ -247,14 +252,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	elisp-site-regen
-
-	# Rebuild Info dir file.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${infodir} ${f} &>/dev/null
-	done
-
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 }
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 0a17a78..8b57a73 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-21.4-r10.ebuild:
+  Info rebuild moved to separate function.
+
   28 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-21.4-r10.ebuild:
   Rebuild Info dir file in pkg_postinst and pkg_postrm.
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 644c581..5ffdf6c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -43,14 +43,14 @@ EBUILD emacs-18.59-r3.ebuild 2465 RMD160 87dafe0fcdc9631503d860a1151acd946ce14ab
 MD5 cd9890c79aa5fb5e92b6630bc206b199 emacs-18.59-r3.ebuild 2465
 RMD160 87dafe0fcdc9631503d860a1151acd946ce14aba emacs-18.59-r3.ebuild 2465
 SHA256 910740f3502ac9652df9a2ddb5df720c2fff500354a1b4bb3cf4916422354e52 emacs-18.59-r3.ebuild 2465
-EBUILD emacs-21.4-r10.ebuild 5544 RMD160 70499476d16a952f270b8669a84455ace5823868 SHA1 3e0ee0262ace1fefd07b0ac7866539f00cbbcfe1 SHA256 b4954979430a56c312a3edbebd1b45ea71492cea75b54fdf67990958c6764670
-MD5 8a7431389cb15a6fbde0decdba9c672b emacs-21.4-r10.ebuild 5544
-RMD160 70499476d16a952f270b8669a84455ace5823868 emacs-21.4-r10.ebuild 5544
-SHA256 b4954979430a56c312a3edbebd1b45ea71492cea75b54fdf67990958c6764670 emacs-21.4-r10.ebuild 5544
-MISC ChangeLog 2388 RMD160 3f00cfec88da625d6cb36639e5c78b1bf732917b SHA1 31cae78cbff5d4057af853bbb99da6b43aa38327 SHA256 a0ba8ae8d1e975ee4a660aa7ed2162511438fcf9325c551ffd05c3773f373289
-MD5 6bd3c4abdf8f6204474866e51cf64a0b ChangeLog 2388
-RMD160 3f00cfec88da625d6cb36639e5c78b1bf732917b ChangeLog 2388
-SHA256 a0ba8ae8d1e975ee4a660aa7ed2162511438fcf9325c551ffd05c3773f373289 ChangeLog 2388
+EBUILD emacs-21.4-r10.ebuild 5460 RMD160 3918acc7d4517cd9fcc14fd331951f7edd3e527e SHA1 8f8fb25ce19f0c8dfd646d9ab66e40fd0d1ac453 SHA256 81edf10ed0d4e04ac086aa9808cd2f63cb7725468a11b7fc693f47b54351a1ed
+MD5 61b1c53c85750622a9068aa3b0b4f4c1 emacs-21.4-r10.ebuild 5460
+RMD160 3918acc7d4517cd9fcc14fd331951f7edd3e527e emacs-21.4-r10.ebuild 5460
+SHA256 81edf10ed0d4e04ac086aa9808cd2f63cb7725468a11b7fc693f47b54351a1ed emacs-21.4-r10.ebuild 5460
+MISC ChangeLog 2508 RMD160 71cba626b8f195f27e24d4c83e1b1bcbc3860f8d SHA1 31b46d740a52977062cb2fe9ddafae6fc1a588be SHA256 a63b099d2d65ecf0f0bf1ae5aa8a21a43c28761d4fa2885d78966ee0e14c3263
+MD5 2acaaedeec31f1b3ceb9f665f5b21326 ChangeLog 2508
+RMD160 71cba626b8f195f27e24d4c83e1b1bcbc3860f8d ChangeLog 2508
+SHA256 a63b099d2d65ecf0f0bf1ae5aa8a21a43c28761d4fa2885d78966ee0e14c3263 ChangeLog 2508
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
diff --git a/app-editors/emacs/emacs-21.4-r10.ebuild b/app-editors/emacs/emacs-21.4-r10.ebuild
index 02d078e..84acc25 100644
--- a/app-editors/emacs/emacs-21.4-r10.ebuild
+++ b/app-editors/emacs/emacs-21.4-r10.ebuild
@@ -157,20 +157,26 @@ src_install() {
 	dodoc BUGS ChangeLog README
 }
 
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
-
+emacs-infodir-rebuild() {
 	# Depending on the Portage version, the Info dir file is compressed
 	# or removed. It is only rebuilt by Portage if our directory is in
 	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	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=${infodir} ${f} &>/dev/null
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
 	done
+	echo
+}
 
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
+
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 
 	if use nosendmail; then
@@ -189,13 +195,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	# Rebuild Info dir file.
-	local infodir=${ROOT}/usr/share/info/emacs-${SLOT} f
-	rm -f ${infodir}/dir{,.*}
-	for f in ${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${infodir} ${f} &>/dev/null
-	done
-
+	emacs-infodir-rebuild
 	eselect emacs update --if-unset
 }