From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4E3A138334 for ; Thu, 13 Dec 2018 22:24:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3A43E0E06; Thu, 13 Dec 2018 22:24:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AF47E0DF2 for ; Thu, 13 Dec 2018 22:24:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 474ED335CF9 for ; Thu, 13 Dec 2018 22:24:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5D1A4F8 for ; Thu, 13 Dec 2018 22:24:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1544739839.12b3263e045ddcaa321e51e93625f42cd906abdf.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kinfocenter/kinfocenter-5.14.49.9999.ebuild kde-plasma/kinfocenter/kinfocenter-9999.ebuild X-VCS-Directories: kde-plasma/kinfocenter/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 12b3263e045ddcaa321e51e93625f42cd906abdf X-VCS-Branch: master Date: Thu, 13 Dec 2018 22:24:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c623a78e-c791-4d12-8c45-88b772eb0a4c X-Archives-Hash: 565fcc0883e9992d5a7e948bc1039ee1 commit: 12b3263e045ddcaa321e51e93625f42cd906abdf Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 13 21:30:26 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 13 22:23:59 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=12b3263e kde-plasma/kinfocenter: Reduce pkg_postinst spam Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/kinfocenter/kinfocenter-5.14.49.9999.ebuild | 14 +++++++++----- kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 16 ++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.49.9999.ebuild index 6cf8e420f1..be6e870b36 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.14.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.14.49.9999.ebuild @@ -87,10 +87,14 @@ src_install() { } pkg_postinst() { - if ! has_version "net-fs/nfs-utils"; then - elog "Installing net-fs/nfs-utils will enable the NFS information module." - fi - if ! has_version "net-fs/samba"; then - elog "Installing net-fs/samba will enable the Samba status information module." + kde5_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + if ! has_version "net-fs/nfs-utils"; then + elog "Installing net-fs/nfs-utils will enable the NFS information module." + fi + if ! has_version "net-fs/samba"; then + elog "Installing net-fs/samba will enable the Samba status information module." + fi fi } diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index ee9401e6cf..2cfbd78d4e 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 KDE_HANDBOOK="true" inherit kde5 -DESCRIPTION="A utility that provides information about a computer system" +DESCRIPTION="Utility providing information about the computer hardware" HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/" SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png" KEYWORDS="" @@ -87,10 +87,14 @@ src_install() { } pkg_postinst() { - if ! has_version "net-fs/nfs-utils"; then - elog "Installing net-fs/nfs-utils will enable the NFS information module." - fi - if ! has_version "net-fs/samba"; then - elog "Installing net-fs/samba will enable the Samba status information module." + kde5_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + if ! has_version "net-fs/nfs-utils"; then + elog "Installing net-fs/nfs-utils will enable the NFS information module." + fi + if ! has_version "net-fs/samba"; then + elog "Installing net-fs/samba will enable the Samba status information module." + fi fi }