Use functions from readme.gentoo.eclass instead of elog.

Package-Manager: portage-2.1.11.54/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 37 insertions, 35 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 1f711b7230b4..9d879b34ab94 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.555 2013/03/05 13:49:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.556 2013/03/05 18:25:34 ulm Exp $
+
+  05 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r5.ebuild:
+  Use functions from readme.gentoo.eclass instead of elog.
 
 *emacs-24.3_rc1 (05 Mar 2013)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ef56a1508015..539fe52fdd4b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -20,23 +20,23 @@ EBUILD emacs-18.59-r8.ebuild 4466 SHA256 5d9cb405643e4c9cf25305391971337e1f5df1b
 EBUILD emacs-21.4-r24.ebuild 5281 SHA256 ef4b77d66d1c52147c5cb11dd09981bc48f7c457853332341ee61637443e1429 SHA512 f0f902d95a19dec0328e6eb294bb361b1ef19154e03fcc044ff212531cf71a3f313438140204fcd12d16b3bdc6110bf12d0873d3ac549491ff91624542b66ec7 WHIRLPOOL 08386a14de3c9de6a94674c1674cd48ab41c26ac10833d71e0613c46fba7e6e238c6e64fe9f0d1e44bb74ce723cf8979d847d84f720fb24fa95edaee2fff0ce9
 EBUILD emacs-22.3-r10.ebuild 7734 SHA256 35ccf877f451a9acbeb876ff07067ef9bf7cb2c17078ec0fe89f5541b7dd78f8 SHA512 d201d19ebc751c2b62d07f4b44d1fd7575526d3ead163620d9c1ccb4dee957656e826339bc4fad828840da285cf0fbb61b785513f5d3295d8a177c17bfed4b08 WHIRLPOOL f5dd5c6c65dbf23cdb0d974bfee5f88fbd0f34e3a62a1bc89feed5406e00dabe805c41cea9b7164151cf5a71d33cc3ece8b82c09c9be5db6ca98950ed18d43b4
 EBUILD emacs-23.4-r4.ebuild 10634 SHA256 52d428ada2fe97a03b744d819b4614da0f60af5c1c3733bcfed901a86370580a SHA512 2149e7dc0fd76f091b776de8d2e01fe5ff42e693193aaac1ddd49d0c5fd0af0fe2330a9aa4df77b60e44ebc614063183aabd1179b66ad4045190d5829fc7caa0 WHIRLPOOL e00d065bbaafb2879ce61e5c963af0d6f5ca946659343543bcaba395e48eff1c76a6c40f33ac71a066e316b539280185e5400bf5633c0f5d8e3dcd02722e24ca
-EBUILD emacs-23.4-r5.ebuild 10635 SHA256 5009c5f47bb6bf7f131dbacb964f5e6d97575e32bd33d25f669fee1fa132ee61 SHA512 d3e1c3016eeab40604723e70e0aa272ced061df5d94eb6e3628c0687ee6274f82317e95d419c1785a71d5157c4dd74e7c6109a9baf18a95f43fc50e65295a4bf WHIRLPOOL 38ce6706e548e9d85ab752c7969d7d320ba619e4e518a2706d3ab88a9cb5047c40d0260cdd7f0c2d928c8517fda8ac3245d4f7020be9bcc9a4af0ee5a61107fd
+EBUILD emacs-23.4-r5.ebuild 10663 SHA256 6139f5b91c49c0c0ac14c7a59f4f53d585bfa1af6c62387866835fef5c8f42a1 SHA512 602eeab193903ee34bc31789ed16b91b61c7a98cf1e8c48a9c751f1964a7a2d0f3efc1b01803c963cdbdcaab82b4e0d2a48e5584dc909573b3b3a4900dca4c41 WHIRLPOOL 8e3f4b3b54f1514fe74247c47e2dfc74c0f6a26c415326c086a6ed107a3156c13cf354f9ec253c7fc69ef1e2107ee5843683c99545f581b02dd4df0c719e69b4
 EBUILD emacs-24.2-r1.ebuild 11021 SHA256 da878922aeaede0ab406773e7515504719efce1f3d3599ec939c5bdd398e3015 SHA512 34e7bfafc6a3d3160c0ca1edd0e5891d29cddf644786b7cb262ff1df527dea8cc115ba2c1c4a7809e846e485755cc95eaa9b5194eb48fd163863edbbb6487b6f WHIRLPOOL 796b5f48d33c54e663155f394231d943e6499f293f71b73450edf7312ed18e17f827604e18895587598446634f2bc9592e62a1ca0c25d4ee3e6684631acecb88
 EBUILD emacs-24.2.ebuild 11017 SHA256 6b157930e2a70011c64b11954e49b4e87011f4d882f849fd9255661aa7019f3d SHA512 712f8185cfa359d0b55d34f3ca51008ba0c54fddfa4baa5ec41a7e7ac48a3eea84cb212643eb793afcc76df8392fedc10c60041e8d5593c003f5762b008ea92d WHIRLPOOL 84f939f5a8472ed0ad1ff92dd4f47fe39d73bbd26c4154f7e7a17e8cd681c02411fb9cc281966f5944f4e5b4feeeb2f0fcc61ca436f8d16e6ea0c2d2779b022e
 EBUILD emacs-24.3_rc1.ebuild 10623 SHA256 cd827fe58a585423a73703b937b11bfebf73368903f6196ff93c6bb91dd0dfb3 SHA512 ec349cb6d76c4e080e6d9f3e11bf3fc9fd930afdc865c4e508cdc579b1b5da2fe6eaa1e9f6b5dfc28933126f97b4ab62353c577038ee2226dafb63355e1878e3 WHIRLPOOL b81bea04a08e0e22a2e56fb68ef0832e42152531f0e4d8e2abe10633aaeafc5c30c10c5907265b9dfdd53f511bd8a9f72891ea402274e8221a559719b8e5c0ea
-MISC ChangeLog 77152 SHA256 d48ad25447c9495b0a379b732bfe9eafafe246627b5aaf4ca59ab2fa28ec96ec SHA512 e1919c905986643459d8f435b3aa1218d3552fa80b99aada6455f55ff8332dc1949dfb93e23e1439e4630d8a2f35b10ccc4f6350933bcc36c69bb67a90f461bf WHIRLPOOL 1ac8ed43a152ed469864b00c1873827c3a43ee55c8fab537e66bc2f585fbf916af396a0a99bd2aee629a3e665861d424106ca883d0febbd417f7d9b3ca001763
+MISC ChangeLog 77281 SHA256 48fcd02a4c0927ac770dd76194b36244a483577e3ef6fa6008855409f843d21b SHA512 cc7c87b689ad9d27287d483c1ddec5fbfdacaab7fe3316d8cba4c6bb88f0a785ed1a43db02663dad2ccb5af4dfcbbe8f53c42b7905a815ce7d0e7a1162d30b5e WHIRLPOOL 5165c359c4779cbe3dcc98bc63018fd95a258fc61dc7d664bba0ab9039cb85b015e7bda69dbe1cc0c3c6c8879c94271df062f13232895305196aa503252134b5
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRNfj+AAoJEJQzkH1pP7W48I8L/3QugHjDjR646jdjq6PNJvOf
-JKiDUyP/AaTIA8VqFO2FQihNNDMbgl5AVsLquaJ8P3rPBVz2o+/5Wurc3SqeredU
-jIW+aO51sISgnDA59f/UX8KSFk1fndnXJslE/RWXNcdh/811MmK/UVOi+qAC99N0
-KmP22XKjhVD21lfyjC0J0j6uJfWGCA3JOEfvSGOMjeY1g4AeJsvl5AYync3ElLUf
-YMQt0DFNCMccNq1KsQP039+z38D8xBnxHR6I28p9+Hn77tTvsx8V/SBeCUm+k8sg
-BvP+F24D36JRh2YhM6tc7UT+ysrBxkUt5rUvI2KFFD6s3BdScHn6SahOZdIKYleT
-Zb8dE5NksqIqZxvqyoh6OQH1dlmE3H3vyrAxrBNivN5z4NYNQq2wsLJLA7Rr3Yag
-4HwHw1eXTpU/nKLUfI5WjrwKL+JNpRJRGY1W1jTnNNejSec9xgfOa85gz+Rpm5aY
-ef5PiIpJn6XyWpxDzcB24xbr5MeQiqfEhHRVomTDMw==
-=IHQ5
+iQGcBAEBCAAGBQJRNjnFAAoJEJQzkH1pP7W4Ym4MAJtHSRPhRhFQA3AuwzFbkwG9
+3HTmhkKmRdssl/gNSMQT/Fsd53W6IZWcNz/6TSzxCr57XLt7YDG0fOr42M40wExT
+Ggyl1GJ5OlOnv/0wXeLUlqDuyT2Awd9h58JrhzT4uMDm/1SKB931+6RnFoZoeSWq
+dMs/XV4NXEjsLodFbZcimdg/mKgj6ig81CLvutcU8ejY5+EjYy992H9/Jpw/4cwM
+ZXiqZA3rw5NN0Yg6OUCesKVOMrmVduqTqpFIZKafyyWd9yPhNl570c53maYmllju
+gtF6HsAnPBnxniOvCOm37Ap2kRHLoCYT6rJI+JdA84Jqs/wb085pKZ1t7QVTZMUI
+NwuSAdjTPZik3r7xDyK2EDJ5+5/VPLesxTImnA5dmDZZZ9uJK6yGbCd9fODpZAaW
+W7XAqY2vKiXogKhrTX8EdHovzg21z7RnCI2Xv0UW7WrWL3duTLtmuCqEwGgQ76ff
+jtrl7O5XfrmSyqHkkrSB/gBPbZmOiju0WAJpGAIOxw==
+=6xVk
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.4-r5.ebuild b/app-editors/emacs/emacs-23.4-r5.ebuild
index 4682198b7c12..ddd7f641cc99 100644
--- a/app-editors/emacs/emacs-23.4-r5.ebuild
+++ b/app-editors/emacs/emacs-23.4-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.11 2013/03/05 09:17:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.12 2013/03/05 18:25:34 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
 
-inherit autotools elisp-common eutils flag-o-matic multilib
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
@@ -267,9 +267,25 @@ src_install () {
 		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
 		mv nextstep/Emacs.app \
 			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
-		elog "You may want to copy or symlink it into /Applications by yourself."
 	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and
+		info pages. Therefore, several Emacs versions can be installed at
+		the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		${EPREFIX}/Applications/Gentoo. You may want to copy or symlink it
+		into /Applications by yourself."
+	readme.gentoo_create_doc
 }
 
 pkg_preinst() {
@@ -292,6 +308,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	elisp-site-regen
+	readme.gentoo_print_elog
 
 	if use livecd; then
 		# force an update of the emacs symlink for the livecd/dvd,
@@ -300,24 +317,6 @@ pkg_postinst() {
 	else
 		eselect emacs update ifunset
 	fi
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-	elog
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
 }
 
 pkg_postrm() {