Don't show elog messages always (#457596)

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 26 insertions, 30 deletions

diff --git a/dev-util/buildbot-slave/ChangeLog b/dev-util/buildbot-slave/ChangeLog
index e6fd3f9e9dbf..2581aac3bda3 100644
--- a/dev-util/buildbot-slave/ChangeLog
+++ b/dev-util/buildbot-slave/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/buildbot-slave
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/ChangeLog,v 1.36 2013/01/26 15:50:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/ChangeLog,v 1.37 2013/02/15 20:34:54 pacho Exp $
+
+  15 Feb 2013; Pacho Ramos <pacho@gentoo.org> buildbot-slave-0.8.7_p1.ebuild:
+  Don't show elog messages always (#457596)
 
 *buildbot-slave-0.8.7_p1 (26 Jan 2013)
 
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
index 0ba54666b03e..e42bafaca69f 100644
--- a/dev-util/buildbot-slave/Manifest
+++ b/dev-util/buildbot-slave/Manifest
@@ -6,23 +6,13 @@ AUX buildslave.initd 1139 SHA256 9f4c8d6946ebda59966256856a58dc0eae8581aa072dc0a
 DIST buildbot-slave-0.8.7.tar.gz 103028 SHA256 fd5436bf3686afb2e4e826fa0a3204f7e40c4e0863815989ecf7495a8b361236 SHA512 08be04e5e020f3fa5946ead5dff1be4a4619b69a4d9b8f333dcc3b5aa6edd836610c1da434892d6c42e6dc0698062a5b6904cfb8743c68ea0bfac7ce4b066eaf WHIRLPOOL 8a0efa107a34dc6f2d04624d1c73d085b6ac4bd49c84d2a908bc0961a7e81ebea993d181186419b0b3fe369037fe52fe029d556f51ef77747a5893e1a446e9a3
 DIST buildbot-slave-0.8.7p1.tar.gz 104575 SHA256 bbdb07a3847efa186f942142a09394b467d7375745c49da0a42e9aa5b206eadc SHA512 ee9a119461915716167a258d9c022956e239e21ed524c2ae148b6682dd1410b5d918723e8e51002bc1fc27f67cb59da15cb2293e4939ee5ba08d1e5e067e11fe WHIRLPOOL c523849db5cb743f3b4d93f33305a46682710afcf66fdda3ab807dd412171c5e40e1089849b0f3c901dd75525fe97995a791bf9c15f01f47fdb18d0456b17de3
 EBUILD buildbot-slave-0.8.7.ebuild 1866 SHA256 136cd44a28bea97db323fd87e4601bbcf157c4e96ff7eca7056d8bcc9a309539 SHA512 a1e20f297857482df8b3aeca8fa90b58c164e12167f8af1737ec595e20eefd1bcf097a5a80fbd9190eb4780fadaa176c12909f7188ac70f1a12f71d976f8800e WHIRLPOOL 134a7911a20c14d552e6e2c42808b13c08101ab0fafb9dc7295514a411bac7bc0462c609296239913d1302cf2ce97a104d0abf9eedbaf385c76b08ed4522b978
-EBUILD buildbot-slave-0.8.7_p1.ebuild 1881 SHA256 19d104fc0327f3f05f9694cb4151ef0b133859bca0783c9de0d41b9e5ec5a525 SHA512 cf44a01a1b649b85aec660b8e6d08cd3cfabd336bead3cfafb40a8a68c3c957dcc3fa3451962923dbd6209e376206af12ab5120a0e4939a8b98ec5e1c15f5cd8 WHIRLPOOL 45483f6668ed7e8a07b6f6d95ea46a6b761c80e1b3615003537ca757afe3f86a0269ae045bf4fc5c9f9f312f52fc722b00de6e9eb30eb657fcb97329f82e8bc9
-MISC ChangeLog 5017 SHA256 0a79826c3edc5669a81f872c7bb7be60d53109d3f01cede31213115052dd04ed SHA512 056890942d00b4a385f462d54a49665d7b8e8f7fda7c4215aaeeef32d93be3baf1d07b466189a7ab10513adaa8102493f9138748b0d0e445c27d6df7cda79481 WHIRLPOOL 33bd818f2fea48f8e6f3ef4dadb568aa036c63baf8a337848e12b4b5bcf118bf46d10e90e6888b147ab429f538ee5568d37546382815f8de37f2b11da247df95
+EBUILD buildbot-slave-0.8.7_p1.ebuild 1845 SHA256 d388247c6bdc8a31ca73b38f0e26af0f2d4990bdb204f44d44f532ce8c7fda77 SHA512 8c8c6b44397c2f10a12e993602bf7f84b2c61cfb14b81396ca9e3457f27aba5a24f0ddb0733d2c620bcc9a3471f07d029b8bd28792751bd711cb6b01ef7ccf5b WHIRLPOOL 87a98fab895f53a8e74a1a21578a1105fe33b59a5c65c9b1b5280e98d3e6577deceaaa2036373ac8b686187cf6697880151066be9b4a8090c868a37b251c64d1
+MISC ChangeLog 5137 SHA256 146d92bd0bb43da614c4bbf453d33d52e5f6f06cde2e41495f148ef3100764ca SHA512 dff815bcd8fb2e7a64d64ddfa26be83ee8d14eff5b7d6dd1a9f08c3fd4649c8d7ed89361fb1fa316d6cee7ebfaa0b4ed0939c40ee90b2b6bdc29e34af9074a14 WHIRLPOOL 614ce458bbd13b6d2bcd869c1a647b6ed79a36aa8bd41deaa84b62fb5c641347a8ecdd40adea88218ee793a26aea7ff3fbe528dc50e6bcce18e8fcd24bf01890
 MISC metadata.xml 334 SHA256 c16b48529b158cd93ef72456bf35a1b51617ab6a8210f4ba4a034ffd26cdc7a0 SHA512 23d3a3a3d00fca47e2eca7716e93a5ed59ea7eb0a8ab9c83ad99eadcea3b631f56e49b08b7e363be0039fa7fce13a4a49122998c6c8436c9d0632a5e496b3d12 WHIRLPOOL 5fe6808a39fbc26a8cc94b7ef355a1bb08280c32ffbc45e0baf8efd2ee77a1ece0f0d0b75a024abd569987af64fa20a966c62d13350ffeda9eae1d5bc25c7188
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRA/tIAAoJEPqDWhW0r/LC6M4P/3WIeeYo9UG2AkWdD82EGoRR
-hPUzquXh6fw9GnUZnDZrkv62xLc2ker+eVFPmRfMozIfh70SZ9xyCd+RH/GeVHoy
-yX/hr5US2KMZDp85bftHd435MJwtgDEl6xPD0Vo3hT72DY6HDucIU7KOjG9pRrk2
-TGCpwdRddu4BQRLWDxcDBjVorEzgiO4IJp/9je8es1ZcmK+dHmW+7lk4PV29JCHY
-ydzsfsLjYYFYnm8q7HjB7A/A+Ht48+fPYoOtmPnzOL9+VT5Osr35nCDzhWV/S3+S
-hfw0JlzUNyvnuM5mBa0+sUCMpHfYcigW3aYlnqRBfZ8Fmoe/Q1zeWPe407RsDpoM
-D84gEQ9wEf+evV/yRDiCe3JKhwgyK6ErywkRYkTA1rorwYZiC+r3hvm5iwywFhz0
-cXB9qdrUDGj8yQ3OIKYOKAFudK9XT4xYobneX4TdJOfLoJu1ntweCqez8Yf7xKr6
-HCMkKFR8ZjkI8wmgsJ+dHRpSpoeHlbi2x4KlmXzGVRyUP4ItnvVmlsKL+berBzhB
-NCvRLnQG6Y8RkRQcU4pcw1E0SS6J3LFO7JGjSm2ew5EF52pYl/v6+Gya6gznf8gh
-0CyeOJfzvPppTNdJ6yLAb/mjl+O/muKjzTashQInf3vfnpxUUTIIaNdiB47MuVZ7
-qqmIEPcPcog8I4iSkN4U
-=Xj//
+iEYEAREIAAYFAlEem+8ACgkQCaWpQKGI+9S8BwCfY7RtM5bwjLvqp1C+z4tYJfTs
+/4oAnAlgR0xRonvpT+PQABCcII9fHPnd
+=HnGy
 -----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.7_p1.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.7_p1.ebuild
index 65606dcc78ee..726259f4a700 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.7_p1.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.7_p1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.7_p1.ebuild,v 1.1 2013/01/26 15:50:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.7_p1.ebuild,v 1.2 2013/02/15 20:34:54 pacho Exp $
 
-EAPI="3"
+EAPI="5"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="trial buildslave"
 DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
 
-inherit distutils user
+inherit distutils readme.gentoo user
 
 DESCRIPTION="BuildBot Slave Daemon"
 HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"
@@ -37,25 +37,28 @@ S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	python_pkg_setup
 	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
+		to support starting buildslave through Gentoo's init system. To use this,
+		set up your build slave following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can
+		run as a different user if desired. If you need to run more than one
+		build slave, just copy the scripts."
 }
 
 src_install() {
 	distutils_src_install
 
-	doman docs/buildslave.1 || die "doman failed"
+	doman docs/buildslave.1
+
+	newconfd "${FILESDIR}/buildslave.confd" buildslave
+	newinitd "${FILESDIR}/buildslave.initd" buildslave
 
-	newconfd "${FILESDIR}/buildslave.confd" buildslave || die "newconfd failed"
-	newinitd "${FILESDIR}/buildslave.initd" buildslave || die "newinitd failed"
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	distutils_pkg_postinst
-
-	elog "The \"buildbot\" user and the \"buildslave\" init script has been added"
-	elog "to support starting buildslave through Gentoo's init system. To use this,"
-	elog "set up your build slave following the documentation, make sure the"
-	elog "resulting directories are owned by the \"buildbot\" user and point"
-	elog "\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can"
-	elog "run as a different user if desired. If you need to run more than one"
-	elog "build slave, just copy the scripts."
+	readme.gentoo_print_elog
 }