| 1 |
commit: 3acabde8a7aa0d278e8aa0d3f48a57b467fecd27 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 7 13:35:40 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 7 15:05:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3acabde8 |
| 7 |
|
| 8 |
kde-apps/konqueror: Use optfeature |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
kde-apps/konqueror/konqueror-20.08.49.9999.ebuild | 28 ++++++--------------- |
| 14 |
kde-apps/konqueror/konqueror-9999.ebuild | 30 ++++++----------------- |
| 15 |
2 files changed, 15 insertions(+), 43 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild b/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild |
| 18 |
index 10ebf1d25b..16d9aaeb6c 100644 |
| 19 |
--- a/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild |
| 20 |
+++ b/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild |
| 21 |
@@ -8,7 +8,7 @@ ECM_TEST="true" |
| 22 |
KFMIN=5.72.0 |
| 23 |
QTMIN=5.14.2 |
| 24 |
VIRTUALX_REQUIRED="test" |
| 25 |
-inherit flag-o-matic ecm kde.org |
| 26 |
+inherit flag-o-matic ecm kde.org optfeature |
| 27 |
|
| 28 |
DESCRIPTION="Web browser and file manager based on KDE Frameworks" |
| 29 |
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror" |
| 30 |
@@ -79,26 +79,12 @@ src_configure() { |
| 31 |
} |
| 32 |
|
| 33 |
pkg_postinst() { |
| 34 |
- ecm_pkg_postinst |
| 35 |
- |
| 36 |
if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 37 |
- if ! has_version kde-apps/keditbookmarks:${SLOT} ; then |
| 38 |
- elog "For bookmarks support, install keditbookmarks:" |
| 39 |
- elog "kde-apps/keditbookmarks:${SLOT}" |
| 40 |
- fi |
| 41 |
- |
| 42 |
- if ! has_version kde-apps/dolphin:${SLOT} ; then |
| 43 |
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" |
| 44 |
- elog "kde-apps/dolphin:${SLOT}" |
| 45 |
- fi |
| 46 |
- |
| 47 |
- if ! has_version kde-apps/svg:${SLOT} ; then |
| 48 |
- elog "For konqueror to view SVGs, install the svg kpart:" |
| 49 |
- elog "kde-apps/svgpart:${SLOT}" |
| 50 |
- fi |
| 51 |
- |
| 52 |
- if ! has_version virtual/jre ; then |
| 53 |
- elog "To use Java on webpages install virtual/jre." |
| 54 |
- fi |
| 55 |
+ elog "Optional dependencies:" |
| 56 |
+ optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT} |
| 57 |
+ optfeature "filemanager component" kde-apps/dolphin:${SLOT} |
| 58 |
+ optfeature "SVG support" kde-apps/svg:${SLOT} |
| 59 |
+ optfeature "Java support on webpages" virtual/jre |
| 60 |
fi |
| 61 |
+ ecm_pkg_postinst |
| 62 |
} |
| 63 |
|
| 64 |
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild |
| 65 |
index d967f89e00..0538477c16 100644 |
| 66 |
--- a/kde-apps/konqueror/konqueror-9999.ebuild |
| 67 |
+++ b/kde-apps/konqueror/konqueror-9999.ebuild |
| 68 |
@@ -3,12 +3,12 @@ |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
|
| 72 |
-ECM_HANDBOOK="optional" # not optional until !kdelibs4support |
| 73 |
+ECM_HANDBOOK="optional" |
| 74 |
ECM_TEST="true" |
| 75 |
KFMIN=5.73.0 |
| 76 |
QTMIN=5.14.2 |
| 77 |
VIRTUALX_REQUIRED="test" |
| 78 |
-inherit flag-o-matic ecm kde.org |
| 79 |
+inherit flag-o-matic ecm kde.org optfeature |
| 80 |
|
| 81 |
DESCRIPTION="Web browser and file manager based on KDE Frameworks" |
| 82 |
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror" |
| 83 |
@@ -78,26 +78,12 @@ src_configure() { |
| 84 |
} |
| 85 |
|
| 86 |
pkg_postinst() { |
| 87 |
- ecm_pkg_postinst |
| 88 |
- |
| 89 |
if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 90 |
- if ! has_version kde-apps/keditbookmarks:${SLOT} ; then |
| 91 |
- elog "For bookmarks support, install keditbookmarks:" |
| 92 |
- elog "kde-apps/keditbookmarks:${SLOT}" |
| 93 |
- fi |
| 94 |
- |
| 95 |
- if ! has_version kde-apps/dolphin:${SLOT} ; then |
| 96 |
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" |
| 97 |
- elog "kde-apps/dolphin:${SLOT}" |
| 98 |
- fi |
| 99 |
- |
| 100 |
- if ! has_version kde-apps/svg:${SLOT} ; then |
| 101 |
- elog "For konqueror to view SVGs, install the svg kpart:" |
| 102 |
- elog "kde-apps/svgpart:${SLOT}" |
| 103 |
- fi |
| 104 |
- |
| 105 |
- if ! has_version virtual/jre ; then |
| 106 |
- elog "To use Java on webpages install virtual/jre." |
| 107 |
- fi |
| 108 |
+ elog "Optional dependencies:" |
| 109 |
+ optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT} |
| 110 |
+ optfeature "filemanager component" kde-apps/dolphin:${SLOT} |
| 111 |
+ optfeature "SVG support" kde-apps/svg:${SLOT} |
| 112 |
+ optfeature "Java support on webpages" virtual/jre |
| 113 |
fi |
| 114 |
+ ecm_pkg_postinst |
| 115 |
} |
Archives