| 1 |
commit: 05116252b706dfa8484c22196a973e596cb387be |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 31 00:22:32 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 21:21:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=05116252 |
| 7 |
|
| 8 |
kde-apps/konqueror: Frameworks merged to master |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
| 13 |
|
| 14 |
kde-apps/konqueror/konqueror-9999.ebuild | 95 +++++++++++++++----------------- |
| 15 |
1 file changed, 45 insertions(+), 50 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild |
| 18 |
index fde7e07..b235417 100644 |
| 19 |
--- a/kde-apps/konqueror/konqueror-9999.ebuild |
| 20 |
+++ b/kde-apps/konqueror/konqueror-9999.ebuild |
| 21 |
@@ -4,91 +4,86 @@ |
| 22 |
|
| 23 |
EAPI=6 |
| 24 |
|
| 25 |
-KDE_HANDBOOK="optional" |
| 26 |
+KDE_HANDBOOK="forceoptional" |
| 27 |
+KDE_TEST="true" |
| 28 |
KMNAME="kde-baseapps" |
| 29 |
-inherit flag-o-matic kde4-meta |
| 30 |
+inherit flag-o-matic kde5 |
| 31 |
|
| 32 |
-DESCRIPTION="Web browser and file manager" |
| 33 |
+DESCRIPTION="Web browser and file manager based on KDE Frameworks" |
| 34 |
HOMEPAGE=" |
| 35 |
https://www.kde.org/applications/internet/konqueror/ |
| 36 |
https://konqueror.org/ |
| 37 |
" |
| 38 |
KEYWORDS="" |
| 39 |
-IUSE="+bookmarks debug +filemanager svg" |
| 40 |
+IUSE="+bookmarks svg X" |
| 41 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
| 42 |
RESTRICT="test" |
| 43 |
|
| 44 |
DEPEND=" |
| 45 |
+ $(add_frameworks_dep karchive) |
| 46 |
+ $(add_frameworks_dep kbookmarks) |
| 47 |
+ $(add_frameworks_dep kcmutils) |
| 48 |
+ $(add_frameworks_dep kcodecs) |
| 49 |
+ $(add_frameworks_dep kcompletion) |
| 50 |
+ $(add_frameworks_dep kconfig) |
| 51 |
+ $(add_frameworks_dep kconfigwidgets) |
| 52 |
+ $(add_frameworks_dep kcoreaddons) |
| 53 |
+ $(add_frameworks_dep kdbusaddons) |
| 54 |
+ $(add_frameworks_dep kdelibs4support) |
| 55 |
+ $(add_frameworks_dep khtml) |
| 56 |
+ $(add_frameworks_dep ki18n) |
| 57 |
+ $(add_frameworks_dep kiconthemes) |
| 58 |
+ $(add_frameworks_dep kio) |
| 59 |
+ $(add_frameworks_dep kitemviews) |
| 60 |
+ $(add_frameworks_dep kjobwidgets) |
| 61 |
+ $(add_frameworks_dep kparts) |
| 62 |
+ $(add_frameworks_dep kservice) |
| 63 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 64 |
+ $(add_frameworks_dep kwindowsystem) |
| 65 |
+ $(add_frameworks_dep kxmlgui) |
| 66 |
$(add_kdeapps_dep libkonq) |
| 67 |
- filemanager? ( |
| 68 |
- $(add_kdebase_dep kactivities '' 4.13) |
| 69 |
- media-libs/phonon[qt4] |
| 70 |
- x11-libs/libXrender |
| 71 |
- ) |
| 72 |
+ $(add_qt_dep qtdbus) |
| 73 |
+ $(add_qt_dep qtgui) |
| 74 |
+ $(add_qt_dep qtwidgets) |
| 75 |
+ $(add_qt_dep qtxml) |
| 76 |
+ X? ( $(add_qt_dep qtx11extras) ) |
| 77 |
" |
| 78 |
- |
| 79 |
-# bug #544630: evince[nsplugin] crashes konqueror |
| 80 |
RDEPEND="${DEPEND} |
| 81 |
$(add_kdeapps_dep kfind) |
| 82 |
$(add_kdeapps_dep kfmclient) |
| 83 |
$(add_kdeapps_dep kurifilter-plugins) |
| 84 |
bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) |
| 85 |
- filemanager? ( |
| 86 |
- $(add_kdeapps_dep kdebase-kioslaves) |
| 87 |
- $(add_kdeapps_dep kfind) |
| 88 |
- $(add_kdeapps_dep konsolepart) |
| 89 |
- !kde-apps/dolphin:4 |
| 90 |
- ) |
| 91 |
- svg? ( $(add_kdeapps_dep svgpart) ) |
| 92 |
- !app-text/evince[nsplugin] |
| 93 |
+ svg? ( $(add_kdeapps_dep svgpart '' 5.9999) ) |
| 94 |
" |
| 95 |
|
| 96 |
-KMEXTRA=" |
| 97 |
- dolphin/ |
| 98 |
-" |
| 99 |
- |
| 100 |
-KMEXTRACTONLY=" |
| 101 |
- konqueror/client/ |
| 102 |
- lib/konq/ |
| 103 |
-" |
| 104 |
+S="${S}/${PN}" |
| 105 |
|
| 106 |
src_prepare() { |
| 107 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
| 108 |
|
| 109 |
- # required for dolphin |
| 110 |
- sed -e "/konq_copytomenu.h/ s/# //" \ |
| 111 |
- -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \ |
| 112 |
- -i lib/konq/CMakeLists.txt \ |
| 113 |
- || die "Failed to fix libkonq CMakeLists.txt" |
| 114 |
+ mv ../doc "${S}" || die |
| 115 |
+ echo "add_subdirectory( doc )" >> CMakeLists.txt || die |
| 116 |
|
| 117 |
- kde4-meta_src_prepare |
| 118 |
- |
| 119 |
- use filemanager || cmake_comment_add_subdirectory dolphin |
| 120 |
+ kde5_src_prepare |
| 121 |
|
| 122 |
# Do not install *.desktop files for kfmclient |
| 123 |
- sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \ |
| 124 |
+ sed -e "/kfmclient\.desktop/d" -i CMakeLists.txt \ |
| 125 |
|| die "Failed to omit .desktop files" |
| 126 |
} |
| 127 |
|
| 128 |
src_configure() { |
| 129 |
- local mycmakeargs |
| 130 |
- |
| 131 |
- if use filemanager ; then |
| 132 |
- mycmakeargs=( |
| 133 |
- -DWITH_Baloo=OFF |
| 134 |
- -DWITH_BalooWidgets=OFF |
| 135 |
- -DWITH_KFileMetaData=OFF |
| 136 |
- ) |
| 137 |
- fi |
| 138 |
- |
| 139 |
- kde4-meta_src_configure |
| 140 |
+ local mycmakeargs=( |
| 141 |
+ $(cmake-utils_use_find_package X X11) |
| 142 |
+ ) |
| 143 |
+ kde5_src_configure |
| 144 |
} |
| 145 |
|
| 146 |
pkg_postinst() { |
| 147 |
- kde4-meta_pkg_postinst |
| 148 |
+ kde5_pkg_postinst |
| 149 |
|
| 150 |
- if use filemanager && ! has_version media-gfx/icoutils ; then |
| 151 |
- elog "For .exe file preview support, install media-gfx/icoutils." |
| 152 |
+ if ! has_version kde-apps/dolphin:${SLOT} ; then |
| 153 |
+ elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" |
| 154 |
+ elog "kde-apps/dolphin:${SLOT}" |
| 155 |
fi |
| 156 |
|
| 157 |
if ! has_version virtual/jre ; then |
Archives