commit: 3acabde8a7aa0d278e8aa0d3f48a57b467fecd27 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 7 13:35:40 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=3acabde8
kde-apps/konqueror: Use optfeature Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/konqueror/konqueror-20.08.49.9999.ebuild | 28 ++++++--------------- kde-apps/konqueror/konqueror-9999.ebuild | 30 ++++++----------------- 2 files changed, 15 insertions(+), 43 deletions(-) diff --git a/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild b/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild index 10ebf1d25b..16d9aaeb6c 100644 --- a/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild +++ b/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild @@ -8,7 +8,7 @@ ECM_TEST="true" KFMIN=5.72.0 QTMIN=5.14.2 VIRTUALX_REQUIRED="test" -inherit flag-o-matic ecm kde.org +inherit flag-o-matic ecm kde.org optfeature DESCRIPTION="Web browser and file manager based on KDE Frameworks" HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"; @@ -79,26 +79,12 @@ src_configure() { } pkg_postinst() { - ecm_pkg_postinst - if [[ -z "${REPLACING_VERSIONS}" ]]; then - if ! has_version kde-apps/keditbookmarks:${SLOT} ; then - elog "For bookmarks support, install keditbookmarks:" - elog "kde-apps/keditbookmarks:${SLOT}" - fi - - if ! has_version kde-apps/dolphin:${SLOT} ; then - elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" - elog "kde-apps/dolphin:${SLOT}" - fi - - if ! has_version kde-apps/svg:${SLOT} ; then - elog "For konqueror to view SVGs, install the svg kpart:" - elog "kde-apps/svgpart:${SLOT}" - fi - - if ! has_version virtual/jre ; then - elog "To use Java on webpages install virtual/jre." - fi + elog "Optional dependencies:" + optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT} + optfeature "filemanager component" kde-apps/dolphin:${SLOT} + optfeature "SVG support" kde-apps/svg:${SLOT} + optfeature "Java support on webpages" virtual/jre fi + ecm_pkg_postinst } diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild index d967f89e00..0538477c16 100644 --- a/kde-apps/konqueror/konqueror-9999.ebuild +++ b/kde-apps/konqueror/konqueror-9999.ebuild @@ -3,12 +3,12 @@ EAPI=7 -ECM_HANDBOOK="optional" # not optional until !kdelibs4support +ECM_HANDBOOK="optional" ECM_TEST="true" KFMIN=5.73.0 QTMIN=5.14.2 VIRTUALX_REQUIRED="test" -inherit flag-o-matic ecm kde.org +inherit flag-o-matic ecm kde.org optfeature DESCRIPTION="Web browser and file manager based on KDE Frameworks" HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"; @@ -78,26 +78,12 @@ src_configure() { } pkg_postinst() { - ecm_pkg_postinst - if [[ -z "${REPLACING_VERSIONS}" ]]; then - if ! has_version kde-apps/keditbookmarks:${SLOT} ; then - elog "For bookmarks support, install keditbookmarks:" - elog "kde-apps/keditbookmarks:${SLOT}" - fi - - if ! has_version kde-apps/dolphin:${SLOT} ; then - elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" - elog "kde-apps/dolphin:${SLOT}" - fi - - if ! has_version kde-apps/svg:${SLOT} ; then - elog "For konqueror to view SVGs, install the svg kpart:" - elog "kde-apps/svgpart:${SLOT}" - fi - - if ! has_version virtual/jre ; then - elog "To use Java on webpages install virtual/jre." - fi + elog "Optional dependencies:" + optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT} + optfeature "filemanager component" kde-apps/dolphin:${SLOT} + optfeature "SVG support" kde-apps/svg:${SLOT} + optfeature "Java support on webpages" virtual/jre fi + ecm_pkg_postinst }
