Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kfilemetadata/
Date: Mon, 07 Sep 2020 15:07:53
Message-Id: 1599491149.beeabc41920111ff69ab0256aac5f1f219f2e66e.asturm@gentoo
1 commit: beeabc41920111ff69ab0256aac5f1f219f2e66e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 14:26:16 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 15:05:49 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=beeabc41
7
8 kde-frameworks/kfilemetadata: Use optfeature
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild | 13 ++++++-------
14 kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild | 13 ++++++-------
15 2 files changed, 12 insertions(+), 14 deletions(-)
16
17 diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
18 index c47539a481..6be9f03f4d 100644
19 --- a/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
20 +++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
21 @@ -6,7 +6,7 @@ EAPI=7
22 PYTHON_COMPAT=( python3_{7,8,9} )
23 PVCUT=$(ver_cut 1-2)
24 QTMIN=5.14.2
25 -inherit ecm kde.org python-any-r1
26 +inherit ecm kde.org optfeature python-any-r1
27
28 DESCRIPTION="Library for extracting file metadata"
29 LICENSE="LGPL-2+"
30 @@ -58,11 +58,10 @@ src_test() {
31 }
32
33 pkg_postinst() {
34 - ecm_pkg_postinst
35 -
36 - if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
37 - elog "To get additional features, optional runtime dependencies may be installed:"
38 - elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
39 - elog "dev-libs/libxls - indexing of Microsoft Excel files"
40 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
41 + elog "Optional dependencies:"
42 + optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
43 + optfeature "Microsoft Excel file indexing" dev-libs/libxls
44 fi
45 + ecm_pkg_postinst
46 }
47
48 diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
49 index dc3ec3f98c..b339fe8557 100644
50 --- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
51 +++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
52 @@ -6,7 +6,7 @@ EAPI=7
53 PYTHON_COMPAT=( python3_{7,8,9} )
54 PVCUT=$(ver_cut 1-2)
55 QTMIN=5.14.2
56 -inherit ecm kde.org python-any-r1
57 +inherit ecm kde.org optfeature python-any-r1
58
59 DESCRIPTION="Library for extracting file metadata"
60 LICENSE="LGPL-2+"
61 @@ -58,11 +58,10 @@ src_test() {
62 }
63
64 pkg_postinst() {
65 - ecm_pkg_postinst
66 -
67 - if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
68 - elog "To get additional features, optional runtime dependencies may be installed:"
69 - elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
70 - elog "dev-libs/libxls - indexing of Microsoft Excel files"
71 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
72 + elog "Optional dependencies:"
73 + optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
74 + optfeature "Microsoft Excel file indexing" dev-libs/libxls
75 fi
76 + ecm_pkg_postinst
77 }