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 2CB3E138359 for ; Mon, 7 Sep 2020 15:07:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 913FCE0966; Mon, 7 Sep 2020 15:07:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6CCE2E0966 for ; Mon, 7 Sep 2020 15:07:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 F2131340DE3 for ; Mon, 7 Sep 2020 15:07:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CCE035C for ; Mon, 7 Sep 2020 15:07:46 +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: <1599491149.fbd91c2abfd5e20f2561cbd6fecf38d9e2e6dc95.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmail/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kmail/kmail-20.08.49.9999.ebuild kde-apps/kmail/kmail-9999.ebuild X-VCS-Directories: kde-apps/kmail/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fbd91c2abfd5e20f2561cbd6fecf38d9e2e6dc95 X-VCS-Branch: master Date: Mon, 7 Sep 2020 15:07:46 +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: 118a7536-0229-4adb-8c97-0799a8eb8851 X-Archives-Hash: ddc82b9979986af3cdc766eff1e83d05 commit: fbd91c2abfd5e20f2561cbd6fecf38d9e2e6dc95 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 7 13:29:50 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 7 15:05:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbd91c2a kde-apps/kmail: Use optfeature Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kmail/kmail-20.08.49.9999.ebuild | 24 +++++++----------------- kde-apps/kmail/kmail-9999.ebuild | 24 +++++++----------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/kde-apps/kmail/kmail-20.08.49.9999.ebuild b/kde-apps/kmail/kmail-20.08.49.9999.ebuild index cdadd74a7b..6f4f4d5764 100644 --- a/kde-apps/kmail/kmail-20.08.49.9999.ebuild +++ b/kde-apps/kmail/kmail-20.08.49.9999.ebuild @@ -9,7 +9,7 @@ PVCUT=$(ver_cut 1-3) KFMIN=5.72.0 QTMIN=5.14.2 VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org optfeature DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes." HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2 @@ -103,22 +103,12 @@ src_configure() { } pkg_postinst() { - ecm_pkg_postinst - - pkg_is_installed() { - echo "${1} ($(has_version ${1} || echo "not ")installed)" - } - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "KMail supports the following runtime dependencies:" - elog " Virus detection:" - elog " $(pkg_is_installed app-antivirus/clamav)" - elog " Spam filtering:" - elog " $(pkg_is_installed mail-filter/bogofilter)" - elog " $(pkg_is_installed mail-filter/spamassassin)" - elog " Fancy e-mail headers and various useful plugins:" - elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})" - elog " Crypto config and certificate details GUI:" - elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})" + elog "Optional dependencies:" + optfeature "Virus detection" app-antivirus/clamav + optfeature "Spam filtering" mail-filter/bogofilter mail-filter/spamassassin + optfeature "Fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT} + optfeature "Crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT} fi + ecm_pkg_postinst } diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild index fc2ee9e1d9..14b1858a73 100644 --- a/kde-apps/kmail/kmail-9999.ebuild +++ b/kde-apps/kmail/kmail-9999.ebuild @@ -9,7 +9,7 @@ PVCUT=$(ver_cut 1-3) KFMIN=5.73.0 QTMIN=5.14.2 VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org optfeature DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes." HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2 @@ -103,22 +103,12 @@ src_configure() { } pkg_postinst() { - ecm_pkg_postinst - - pkg_is_installed() { - echo "${1} ($(has_version ${1} || echo "not ")installed)" - } - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "KMail supports the following runtime dependencies:" - elog " Virus detection:" - elog " $(pkg_is_installed app-antivirus/clamav)" - elog " Spam filtering:" - elog " $(pkg_is_installed mail-filter/bogofilter)" - elog " $(pkg_is_installed mail-filter/spamassassin)" - elog " Fancy e-mail headers and various useful plugins:" - elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})" - elog " Crypto config and certificate details GUI:" - elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})" + elog "Optional dependencies:" + optfeature "Virus detection" app-antivirus/clamav + optfeature "Spam filtering" mail-filter/bogofilter mail-filter/spamassassin + optfeature "Fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT} + optfeature "Crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT} fi + ecm_pkg_postinst }