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 579C113832E for ; Tue, 2 Aug 2016 21:22:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 256E821C082; Tue, 2 Aug 2016 21:22:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2175121C04E for ; Tue, 2 Aug 2016 21:22:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC862340B28 for ; Tue, 2 Aug 2016 21:22:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC6CC243E for ; Tue, 2 Aug 2016 21:22:07 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1470172912.05116252b706dfa8484c22196a973e596cb387be.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konqueror/konqueror-9999.ebuild X-VCS-Directories: kde-apps/konqueror/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 05116252b706dfa8484c22196a973e596cb387be X-VCS-Branch: master Date: Tue, 2 Aug 2016 21:22:07 +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-Archives-Salt: d921bee2-18f6-4a71-8f7b-78199d0b310e X-Archives-Hash: 2fc431a1dbd2133989de2044355ac9eb commit: 05116252b706dfa8484c22196a973e596cb387be Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jan 31 00:22:32 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue Aug 2 21:21:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=05116252 kde-apps/konqueror: Frameworks merged to master Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber gentoo.org> kde-apps/konqueror/konqueror-9999.ebuild | 95 +++++++++++++++----------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild index fde7e07..b235417 100644 --- a/kde-apps/konqueror/konqueror-9999.ebuild +++ b/kde-apps/konqueror/konqueror-9999.ebuild @@ -4,91 +4,86 @@ EAPI=6 -KDE_HANDBOOK="optional" +KDE_HANDBOOK="forceoptional" +KDE_TEST="true" KMNAME="kde-baseapps" -inherit flag-o-matic kde4-meta +inherit flag-o-matic kde5 -DESCRIPTION="Web browser and file manager" +DESCRIPTION="Web browser and file manager based on KDE Frameworks" HOMEPAGE=" https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/ " KEYWORDS="" -IUSE="+bookmarks debug +filemanager svg" +IUSE="+bookmarks svg X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT="test" DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep libkonq) - filemanager? ( - $(add_kdebase_dep kactivities '' 4.13) - media-libs/phonon[qt4] - x11-libs/libXrender - ) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + X? ( $(add_qt_dep qtx11extras) ) " - -# bug #544630: evince[nsplugin] crashes konqueror RDEPEND="${DEPEND} $(add_kdeapps_dep kfind) $(add_kdeapps_dep kfmclient) $(add_kdeapps_dep kurifilter-plugins) bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) - filemanager? ( - $(add_kdeapps_dep kdebase-kioslaves) - $(add_kdeapps_dep kfind) - $(add_kdeapps_dep konsolepart) - !kde-apps/dolphin:4 - ) - svg? ( $(add_kdeapps_dep svgpart) ) - !app-text/evince[nsplugin] + svg? ( $(add_kdeapps_dep svgpart '' 5.9999) ) " -KMEXTRA=" - dolphin/ -" - -KMEXTRACTONLY=" - konqueror/client/ - lib/konq/ -" +S="${S}/${PN}" src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc - # required for dolphin - sed -e "/konq_copytomenu.h/ s/# //" \ - -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \ - -i lib/konq/CMakeLists.txt \ - || die "Failed to fix libkonq CMakeLists.txt" + mv ../doc "${S}" || die + echo "add_subdirectory( doc )" >> CMakeLists.txt || die - kde4-meta_src_prepare - - use filemanager || cmake_comment_add_subdirectory dolphin + kde5_src_prepare # Do not install *.desktop files for kfmclient - sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \ + sed -e "/kfmclient\.desktop/d" -i CMakeLists.txt \ || die "Failed to omit .desktop files" } src_configure() { - local mycmakeargs - - if use filemanager ; then - mycmakeargs=( - -DWITH_Baloo=OFF - -DWITH_BalooWidgets=OFF - -DWITH_KFileMetaData=OFF - ) - fi - - kde4-meta_src_configure + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + kde5_src_configure } pkg_postinst() { - kde4-meta_pkg_postinst + kde5_pkg_postinst - if use filemanager && ! has_version media-gfx/icoutils ; then - elog "For .exe file preview support, install media-gfx/icoutils." + 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 virtual/jre ; then