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 C31E5138359 for ; Mon, 7 Sep 2020 15:07:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3CFCE096F; Mon, 7 Sep 2020 15:07:50 +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 AB1C1E096F for ; Mon, 7 Sep 2020 15:07:50 +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 3F446340DEC for ; Mon, 7 Sep 2020 15:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67316361 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.beeabc41920111ff69ab0256aac5f1f219f2e66e.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kfilemetadata/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild X-VCS-Directories: kde-frameworks/kfilemetadata/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: beeabc41920111ff69ab0256aac5f1f219f2e66e 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: 642b68fa-962b-44b7-a6aa-93a7ec4f2b82 X-Archives-Hash: f898f487dd4776c381f80682ae4c890a commit: beeabc41920111ff69ab0256aac5f1f219f2e66e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 7 14:26:16 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=beeabc41 kde-frameworks/kfilemetadata: Use optfeature Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild | 13 ++++++------- kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild index c47539a481..6be9f03f4d 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PVCUT=$(ver_cut 1-2) QTMIN=5.14.2 -inherit ecm kde.org python-any-r1 +inherit ecm kde.org optfeature python-any-r1 DESCRIPTION="Library for extracting file metadata" LICENSE="LGPL-2+" @@ -58,11 +58,10 @@ src_test() { } pkg_postinst() { - ecm_pkg_postinst - - if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then - elog "To get additional features, optional runtime dependencies may be installed:" - elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files" - elog "dev-libs/libxls - indexing of Microsoft Excel files" + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "Optional dependencies:" + optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc + optfeature "Microsoft Excel file indexing" dev-libs/libxls fi + ecm_pkg_postinst } diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild index dc3ec3f98c..b339fe8557 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PVCUT=$(ver_cut 1-2) QTMIN=5.14.2 -inherit ecm kde.org python-any-r1 +inherit ecm kde.org optfeature python-any-r1 DESCRIPTION="Library for extracting file metadata" LICENSE="LGPL-2+" @@ -58,11 +58,10 @@ src_test() { } pkg_postinst() { - ecm_pkg_postinst - - if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then - elog "To get additional features, optional runtime dependencies may be installed:" - elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files" - elog "dev-libs/libxls - indexing of Microsoft Excel files" + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "Optional dependencies:" + optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc + optfeature "Microsoft Excel file indexing" dev-libs/libxls fi + ecm_pkg_postinst }