commit:     b38da343fd34ebacb73ccc7ea7c5915c65e175f5
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 10:38:15 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 10:39:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38da343

net-wireless/wpa_supplicant: Don't show elog messages always (#548210)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-wireless/wpa_supplicant/Manifest                   |  2 +-
 .../wpa_supplicant/wpa_supplicant-2.6-r3.ebuild        | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 40067ea72e1..b73800a9506 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1 +1 @@
-DIST wpa_supplicant-2.6.tar.gz 2753524 SHA256 
b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
 WHIRLPOOL 
63f91b9f72fee65df5412e90f5a4b38f327f47b44724164aa27a6933a68c68672a129d7c01e658c7fed1f7018fe9e4b743f3c6cef2f69fd75c3f5b9a1cb67c1b
+DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 
99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac
 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
index 75678260475..59cd0456ab7 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils qmake-utils systemd toolchain-funcs
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/";
@@ -51,6 +51,14 @@ RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-networkmanager )
 "
 
+DOC_CONTENTS="
+       If this is a clean installation of wpa_supplicant, you
+       have to create a configuration file named
+       ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
+       An example configuration file is available for reference in
+       ${EROOT%/}/usr/share/doc/${PF}/
+"
+
 S="${WORKDIR}/${P}/${PN}"
 
 Kconfig_style_config() {
@@ -333,6 +341,7 @@ src_install() {
        exeinto /etc/wpa_supplicant/
        newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
 
+       readme.gentoo_create_doc
        dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
                wpa_supplicant.conf
 
@@ -367,12 +376,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       elog "If this is a clean installation of wpa_supplicant, you"
-       elog "have to create a configuration file named"
-       elog "${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
-       elog
-       elog "An example configuration file is available for reference in"
-       elog "${EROOT%/}/usr/share/doc/${PF}/"
+       readme.gentoo_print_elog
 
        if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
                echo

Reply via email to