From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kfilemetadata/
Date: Mon, 7 Sep 2020 15:07:46 +0000 (UTC) [thread overview]
Message-ID: <1599491149.beeabc41920111ff69ab0256aac5f1f219f2e66e.asturm@gentoo> (raw)
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
}
next reply other threads:[~2020-09-07 15:07 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 15:07 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-11 21:34 [gentoo-commits] proj/kde:master commit in: kde-frameworks/kfilemetadata/ Andreas Sturmlechner
2025-04-05 22:10 Andreas Sturmlechner
2024-07-12 19:58 Andreas Sturmlechner
2024-06-20 20:30 Andreas Sturmlechner
2023-09-19 16:44 Andreas Sturmlechner
2023-08-15 14:33 Andreas Sturmlechner
2022-12-04 10:37 Andreas Sturmlechner
2022-11-09 17:17 Andreas Sturmlechner
2022-07-03 10:55 Andreas Sturmlechner
2022-01-05 1:26 Sam James
2021-05-07 15:24 Andreas Sturmlechner
2021-04-04 19:21 Andreas Sturmlechner
2019-10-17 18:10 Andreas Sturmlechner
2019-05-16 8:27 Michael Palimaka
2019-05-16 8:26 Michael Palimaka
2019-02-10 23:11 Andreas Sturmlechner
2019-01-12 8:38 Andreas Sturmlechner
2018-09-30 8:45 Andreas Sturmlechner
2018-08-16 20:45 Andreas Sturmlechner
2018-08-16 20:45 Andreas Sturmlechner
2018-06-10 15:35 Johannes Huber
2018-02-11 22:00 Andreas Sturmlechner
2017-12-03 21:47 Andreas Sturmlechner
2017-12-02 19:19 Andreas Sturmlechner
2017-08-06 22:30 Andreas Sturmlechner
2017-07-09 11:24 Andreas Sturmlechner
2017-06-16 21:10 Andreas Sturmlechner
2017-04-16 10:23 Andreas Sturmlechner
2016-09-14 14:13 Michael Palimaka
2016-08-31 14:39 Michael Palimaka
2016-05-12 12:38 Michael Palimaka
2016-05-12 12:18 Michael Palimaka
2016-05-12 12:18 Michael Palimaka
2015-09-01 16:42 Michael Palimaka
2015-08-03 18:51 Johannes Huber
2015-08-03 18:43 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1599491149.beeabc41920111ff69ab0256aac5f1f219f2e66e.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox