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, 43 insertions, 22 deletions

diff --git a/app-laptop/prey/ChangeLog b/app-laptop/prey/ChangeLog
index 158db65aa465..2bfb30f0fc03 100644
--- a/app-laptop/prey/ChangeLog
+++ b/app-laptop/prey/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-laptop/prey
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/ChangeLog,v 1.11 2012/11/20 20:37:57 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/ChangeLog,v 1.12 2013/02/15 18:47:47 pacho Exp $
+
+  15 Feb 2013; Pacho Ramos <pacho@gentoo.org> prey-0.5.4-r1.ebuild:
+  Don't show elog messages always (#457596)
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> prey-0.5.4-r1.ebuild:
   Stable for x86, wrt bug #432776
diff --git a/app-laptop/prey/Manifest b/app-laptop/prey/Manifest
index ef7705f10205..99453722bfe4 100644
--- a/app-laptop/prey/Manifest
+++ b/app-laptop/prey/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX prey-0.5.3-mplayer-support.patch 1502 SHA256 e36f42783d7d17e73038dbb09b29812d272ecb2cf2d89e5848078d949d5e8245 SHA512 3e9336e97de31f39cfb6d36bfb6dd211ab87906e9c8cf4e1ced3a866244001fb362de728863858c04e4feaddb641a5ed5c82268ebee9f100904c1a4838b07b45 WHIRLPOOL 8dfdc365e12249e00c47174304419aef96e1b130589b9e027619be5a894ae160fab6aa32405b942eec598c887b40ccd48ac1481ec87aef00bc701a1dc1370a31
 AUX prey-0.5.4-cron-functions.patch 1092 SHA256 095373878d722e8aba7aaa9458d291bf1b4989171123eb18988f88a15b4ba91b SHA512 8329c8b9724f27bfa2380bb1e3145c59676bea8a063ac113de8638c8398ba8f4c5e737f9db033e048206e7943e7d39e8e7879f604b14a2a66c1d49f99bf6320c WHIRLPOOL 321ccad74b726609cbcd9f20ed44528fee4c373552112e1e683672cc88e4120f37c8b19f02987f27a497f2aebfe9604dcfef5b8fd23b0259bf1998871d7c1ca0
 AUX prey-0.5.4-gtk-ui.patch 802 SHA256 ab92a66af6d0c3fa7f3512a2467229d7e1a5c805e465fcbf368087dddd347a7c SHA512 4f134a7dda86215550e427f0c22fdac2a34a834f49f1d32778ade3a3a2b233c065f5c8c48ed23b5d1252dd2c21eb92be29ec09ad0d0a5bc479e975200f5532a1 WHIRLPOOL 6d14cd2b7cbead62b0ba9bbfe12f7e138fd59dc59e323d480f50b82472d909ac105eccc91647903bd52c400681d2e8bfa91b651f0ebb7a7f0ebc63719288bf5b
 AUX prey-cron-functions.patch 1118 SHA256 365841680a0351621970a1ca1466c33e470146b3527eb0246990c7b0c3cabd7b SHA512 42760fafa45912d7efa2795d8c3fdd429a2338020994999611d0a9bdcb058ffb26165980df6cd7d17b8e92c25f50bd43e6f37668a984de8d374fe3273c1f1d49 WHIRLPOOL dac579f2f8cd0ccd90ee904fa2a65ab63ddb03086ab4c57d753f071ac1497715974ad0686e025e747d108532271485c9fa4073a2f6fb4e022b4763a911675cdd
 AUX prey.cron 40 SHA256 db734b149b34c68bb28894d01b0fd4d189cc86aca8cacffddfa9059f44d1413c SHA512 2b2e22934428b541e0b2abb0e4838ef2d18f5c44bb61c1aef1e24b83e07bf7dd4e99a3c6e5f4291bc64e089af3dc01cd6fa1c9c3b5851af32b0a0b37e03418f7 WHIRLPOOL 43e10cacb567fb42bc89d3a5d90d005252bdfc836049efa213ec6c44cc75e0672e944d009d349246bcfdb188d76e0a164466afb33601012469ef363945f54550
 DIST prey-0.5.4-linux.zip 646891 SHA256 5d0f6f3e3a48dc5668ff82de55e202e5c28b3fab1f4d71dd55c22b8565583d7e SHA512 15e13b08dd786b3fddf39f8d0e02ceb0e2503be09ea3abde9cfc6431fb2c8388c077f2960dd82d9fb2119929274f2f57e70f642cd8cf3c6e6d76af9701c56724 WHIRLPOOL 3d7e10cfb5926a7f6a5a46c638bb859e6b4b2decb49a979f39573e8f4d2a9c66904e595c144dc4039018d567cd3810f69ef31658018ab3e2dd167ee8bcbbd114
-EBUILD prey-0.5.4-r1.ebuild 4429 SHA256 431024a59c4056e039e6ccf99d921927b30f920fdf78490e0683555968fdf0d5 SHA512 05586ec5a034b2165fb294dfeeb634f7449c683a821fbdb5e0f44b6ebefa899af4f1075d8d70541413e4eeaeb56bde5fdc64aa26f657b084d6be814569845d0e WHIRLPOOL 823b91358693fa55b2b6b92a4fc08bcffa7e4d84e4617f97f60ddaa148ee11c5bbda2478a0796fe9eb1860ce2bbd4c3e558a6f4df22b58d3ddc76b4087749858
-MISC ChangeLog 1877 SHA256 9124e52ce626598fee801b67082a8cfb27e9899ce54cbdbb40039fa2d943dc9b SHA512 03514849bdcac561a95d9763b7c8aa2c748da0b5667688eac37d5228c11e46534babe18644655683c2e1b0d3f571101c6cf7d0f09bf999cc930b6f1cd2cbb7f1 WHIRLPOOL de3a20c8e7c3ce7b2a4e9e0a3f8f6748102e170800dab3f3d2e3106230fe02ed888ec0802cd4b2a2bca4c05fefe774c8c07bf802e4aa14713a16429914e63d07
+EBUILD prey-0.5.4-r1.ebuild 4665 SHA256 d2e88f7290db7d1398b913a6505cb5d083d29080ca4ca380343dd2c2fad08cb3 SHA512 2c7eedfb8c556fb7a062edad7584da7400db7ed0afcbf307c04178dc0fb0ecea3d95a28e10e0f1a84439ce5681aa6e291d0e06cda1452b092a6d195b1a2f2cfb WHIRLPOOL 7f59a1be883094636a7cd26e17e46af148f8a6b9cd78b0ba9f93020add2137e32a5d5d33610589f3d24a1e23cb68082ecd25b425a36142c13d20257a02b226ad
+MISC ChangeLog 1992 SHA256 eb7161b71825101e5a560d004fbe549a489987c92d1ed13dff4fd9fca264246a SHA512 870075da9c8a631476625ef7db704a60a8a55f70ee3dd6414cc6fd411d096f97f87f49e4c3feef59ce8ad7512fc76b242d2147fe48fc6541357e0b88e74024f9 WHIRLPOOL 939b530a7cb0ae46f74a5d0170b9871d4ad545627b37fd7bc269b846ec1c38ee87da05d6464c8af3039771c0ab6910808c618d19a60d9dd1085190d07fd47fa2
 MISC metadata.xml 1344 SHA256 f0667b7a0b0ca396e48f0d1a2522361db5b795ef756c5c5f2362e4ef0c213085 SHA512 03ad661f2916fe01a1f735b8787b0e259cda9ba02d29a8e12777d40e59ce97e4d371ed6a2e2012b3f4187b6a4837f55ffcd5384605abbe21c77b69aed129fe4e WHIRLPOOL 97e37430740f5dc4629e0ba7f571fa8e7eb2cd276114dc0519a9065be6d448e69f806d88a9aab5614dc53e8802b2c8cb5170ea5ba2d804ae4af88f60d92daf40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEegtUACgkQCaWpQKGI+9S4yQCePT/4dQbfQV/uiBDIaykBKBHF
+PVoAnR92/JOguDCXmE/IixnuNh9Br1e5
+=mlV2
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/prey/prey-0.5.4-r1.ebuild b/app-laptop/prey/prey-0.5.4-r1.ebuild
index a5098ca55991..23659fcd6749 100644
--- a/app-laptop/prey/prey-0.5.4-r1.ebuild
+++ b/app-laptop/prey/prey-0.5.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.4-r1.ebuild,v 1.3 2012/11/20 20:37:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.4-r1.ebuild,v 1.4 2013/02/15 18:47:47 pacho Exp $
 
 EAPI=4
 
-inherit eutils user
+inherit eutils readme.gentoo user
 
 DESCRIPTION="Tracking software for asset recovery"
 HOMEPAGE="http://preyproject.com/"
@@ -60,6 +60,28 @@ pkg_setup() {
 }
 
 src_prepare() {
+	DISABLE_AUTOFORMATTING="yes"
+	use userpriv && has_version "${CATEGORY}/${PN}:${SLOT}[-userpriv]" && FORCE_PRINT_ELOG="yes"
+	! use userpriv && has_version "${CATEGORY}/${PN}:${SLOT}[userpriv]" && FORCE_PRINT_ELOG="yes"
+
+	DOC_CONTENTS="--Configuration--
+Make sure you follow the next steps before running prey for the
+first time.
+"
+
+	if use userpriv; then
+		DOC_CONTENTS+="- Add your user to ${PN} group using:
+# gpasswd -a <your_user> ${PN}"
+	else
+		DOC_CONTENTS+="You don't seem to have 'userpriv' enabled so
+${PN} configuration is only accessible as root"
+	fi
+
+	DOC_CONTENTS+="
+- Create an account on http://preyproject.com/
+- Modify the core and module configuration in /etc/prey
+- Uncomment the line in /etc/cron.d/prey.cron"
+
 	# remove system module since it depends on hal and we don't
 	# have hal in portage anymore
 	rm -rf "${S}"/modules/system || die
@@ -141,19 +163,5 @@ src_install() {
 		fi
 	done
 
-}
-pkg_postinst () {
-	elog "--Configuration--"
-	elog "Make sure you follow the next steps before running prey for the"
-	elog "first time"
-	if use userpriv; then
-		elog "- Add your user to ${PN} group using"
-		elog "gpasswd -a <your_user> ${PN}"
-	else
-		elog "You don't seem to have 'userpriv' enabled so"
-		elog "${PN} configuration is only accessible as root"
-	fi
-	elog "- Create an account on http://preyproject.com/"
-	elog "- Modify the core and module configuration in /etc/prey"
-	elog "- Uncomment the line in /etc/cron.d/prey.cron"
+	readme.gentoo_create_doc
 }