commit:     1163c16809ffb553ed24fe9bcac873b8b51340db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 13:23:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 15:05:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1163c168

kde-apps/ark: Use optfeature

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/ark/ark-20.08.49.9999.ebuild | 30 ++++++++----------------------
 kde-apps/ark/ark-9999.ebuild          | 30 ++++++++----------------------
 2 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/kde-apps/ark/ark-20.08.49.9999.ebuild 
b/kde-apps/ark/ark-20.08.49.9999.ebuild
index 4dab32a376..533ef35d2e 100644
--- a/kde-apps/ark/ark-20.08.49.9999.ebuild
+++ b/kde-apps/ark/ark-20.08.49.9999.ebuild
@@ -8,7 +8,7 @@ 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
@@ -62,27 +62,13 @@ 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."
-
-               has_version app-arch/lrzip || \
-                       elog "For handling lrz archives, install 
app-arch/lrzip."
-
-               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
+               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
 }

diff --git a/kde-apps/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild
index 8d39ff50ea..5e042f1083 100644
--- a/kde-apps/ark/ark-9999.ebuild
+++ b/kde-apps/ark/ark-9999.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="optional"
 KFMIN=5.73.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
@@ -62,27 +62,13 @@ 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."
-
-               has_version app-arch/lrzip || \
-                       elog "For handling lrz archives, install 
app-arch/lrzip."
-
-               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
+               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
 }

Reply via email to