[gentoo-commits] proj/kde:master commit in: kde-frameworks/kfilemetadata/

[Andreas Sturmlechner]

commit:     beeabc41920111ff69ab0256aac5f1f219f2e66e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 14:26:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }