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 BC296138359 for ; Mon, 28 Sep 2020 21:33:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1326E07F1; Mon, 28 Sep 2020 21:33:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D3648E0101 for ; Mon, 28 Sep 2020 21:33:29 +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 7CE23340B23 for ; Mon, 28 Sep 2020 21:33:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00BF2385 for ; Mon, 28 Sep 2020 21:33:27 +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: <1601328503.1d57a7d5e8a0054ada73fe713f2864aeef6b2c7c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/ark/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/ark/ark-20.08.1.ebuild X-VCS-Directories: kde-apps/ark/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1d57a7d5e8a0054ada73fe713f2864aeef6b2c7c X-VCS-Branch: master Date: Mon, 28 Sep 2020 21:33:27 +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: 4e214f11-2359-4de2-96a7-79e3a89644ee X-Archives-Hash: 935a311a838f1a70ff6c0e751a8d565f commit: 1d57a7d5e8a0054ada73fe713f2864aeef6b2c7c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 28 19:02:51 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 28 21:28:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d57a7d5 kde-apps/ark: Try unrestrict tests again, but disable failing Sync with kde overlay 20.08 stable branch. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/ark/ark-20.08.1.ebuild | 45 +++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/kde-apps/ark/ark-20.08.1.ebuild b/kde-apps/ark/ark-20.08.1.ebuild index d96ecd65de2..d683f2a5009 100644 --- a/kde-apps/ark/ark-20.08.1.ebuild +++ b/kde-apps/ark/ark-20.08.1.ebuild @@ -8,10 +8,10 @@ ECM_TEST="optional" KFMIN=5.72.0 QTMIN=5.14.2 VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org optfeature -DESCRIPTION="KDE Archiving tool" -HOMEPAGE="https://kde.org/applications/utilities/org.kde.ark +DESCRIPTION="File archiver by KDE" +HOMEPAGE="https://kde.org/applications/en/ark https://utils.kde.org/projects/ark/" LICENSE="GPL-2" # TODO: CHECK @@ -50,9 +50,6 @@ DEPEND="${RDEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 " -# bug #560548, last checked with 16.04.1 -RESTRICT+=" test" - src_configure() { local mycmakeargs=( $(cmake_use_find_package zip LibZip) @@ -61,28 +58,22 @@ src_configure() { ecm_src_configure } -pkg_postinst() { - ecm_pkg_postinst - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - if ! has_version app-arch/rar; then - elog "For creating/extracting rar archives, installing app-arch/rar is required." - if ! has_version app-arch/unar && ! has_version app-arch/unrar; then - elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)." - fi - fi - - has_version app-arch/p7zip || \ - elog "For handling 7-Zip archives, install app-arch/p7zip." +src_test() { + local myctestargs=( + -E "(plugins-clirartest)" + ) - has_version app-arch/lrzip || \ - elog "For handling lrz archives, install app-arch/lrzip." + ecm_src_test +} - if ! has_version kde-misc/markdownpart:${SLOT} || - ! has_version kde-misc/kmarkdownwebview:${SLOT} ; then - elog "For markdown support in text previews, install one of:" - elog " kde-misc/markdownpart:${SLOT}" - elog " kde-misc/kmarkdownwebview:${SLOT}" - fi +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "Optional dependencies:" + optfeature "rar archive creation/extraction" app-arch/rar + optfeature "rar archive extraction only" app-arch/unar app-arch/unrar + optfeature "7-Zip archive support" app-arch/p7zip + optfeature "lrz archive support" app-arch/lrzip + optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT} fi + ecm_pkg_postinst }