Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/ark/
Date: Mon, 28 Sep 2020 21:33:30
Message-Id: 1601328503.1d57a7d5e8a0054ada73fe713f2864aeef6b2c7c.asturm@gentoo
1 commit: 1d57a7d5e8a0054ada73fe713f2864aeef6b2c7c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 28 19:02:51 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 28 21:28:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d57a7d5
7
8 kde-apps/ark: Try unrestrict tests again, but disable failing
9
10 Sync with kde overlay 20.08 stable branch.
11
12 Package-Manager: Portage-3.0.8, Repoman-3.0.1
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-apps/ark/ark-20.08.1.ebuild | 45 +++++++++++++++++------------------------
16 1 file changed, 18 insertions(+), 27 deletions(-)
17
18 diff --git a/kde-apps/ark/ark-20.08.1.ebuild b/kde-apps/ark/ark-20.08.1.ebuild
19 index d96ecd65de2..d683f2a5009 100644
20 --- a/kde-apps/ark/ark-20.08.1.ebuild
21 +++ b/kde-apps/ark/ark-20.08.1.ebuild
22 @@ -8,10 +8,10 @@ ECM_TEST="optional"
23 KFMIN=5.72.0
24 QTMIN=5.14.2
25 VIRTUALX_REQUIRED="test"
26 -inherit ecm kde.org
27 +inherit ecm kde.org optfeature
28
29 -DESCRIPTION="KDE Archiving tool"
30 -HOMEPAGE="https://kde.org/applications/utilities/org.kde.ark
31 +DESCRIPTION="File archiver by KDE"
32 +HOMEPAGE="https://kde.org/applications/en/ark
33 https://utils.kde.org/projects/ark/"
34
35 LICENSE="GPL-2" # TODO: CHECK
36 @@ -50,9 +50,6 @@ DEPEND="${RDEPEND}
37 >=dev-qt/qtconcurrent-${QTMIN}:5
38 "
39
40 -# bug #560548, last checked with 16.04.1
41 -RESTRICT+=" test"
42 -
43 src_configure() {
44 local mycmakeargs=(
45 $(cmake_use_find_package zip LibZip)
46 @@ -61,28 +58,22 @@ src_configure() {
47 ecm_src_configure
48 }
49
50 -pkg_postinst() {
51 - ecm_pkg_postinst
52 -
53 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
54 - if ! has_version app-arch/rar; then
55 - elog "For creating/extracting rar archives, installing app-arch/rar is required."
56 - if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
57 - elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
58 - fi
59 - fi
60 -
61 - has_version app-arch/p7zip || \
62 - elog "For handling 7-Zip archives, install app-arch/p7zip."
63 +src_test() {
64 + local myctestargs=(
65 + -E "(plugins-clirartest)"
66 + )
67
68 - has_version app-arch/lrzip || \
69 - elog "For handling lrz archives, install app-arch/lrzip."
70 + ecm_src_test
71 +}
72
73 - if ! has_version kde-misc/markdownpart:${SLOT} ||
74 - ! has_version kde-misc/kmarkdownwebview:${SLOT} ; then
75 - elog "For markdown support in text previews, install one of:"
76 - elog " kde-misc/markdownpart:${SLOT}"
77 - elog " kde-misc/kmarkdownwebview:${SLOT}"
78 - fi
79 +pkg_postinst() {
80 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
81 + elog "Optional dependencies:"
82 + optfeature "rar archive creation/extraction" app-arch/rar
83 + optfeature "rar archive extraction only" app-arch/unar app-arch/unrar
84 + optfeature "7-Zip archive support" app-arch/p7zip
85 + optfeature "lrz archive support" app-arch/lrzip
86 + optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
87 fi
88 + ecm_pkg_postinst
89 }