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 CEBE813832E for ; Tue, 2 Aug 2016 21:22:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D9DE21C08C; 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 800E721C082 for ; Tue, 2 Aug 2016 21:22:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A3E09340B37 for ; Tue, 2 Aug 2016 21:22:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EAC22444 for ; Tue, 2 Aug 2016 21:22:08 +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.7fa34631dcf25e4758cb3017ccffc8cc72617786.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: 7fa34631dcf25e4758cb3017ccffc8cc72617786 X-VCS-Branch: master Date: Tue, 2 Aug 2016 21:22:08 +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: 9d0cce99-5a9e-4796-b692-6eafaf3f9b9b X-Archives-Hash: 54146e0464adb9dc413fd63703a42db8 commit: 7fa34631dcf25e4758cb3017ccffc8cc72617786 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 2 18:35:09 2016 +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=7fa34631 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 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild index b235417..2f11bde 100644 --- a/kde-apps/konqueror/konqueror-9999.ebuild +++ b/kde-apps/konqueror/konqueror-9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=" https://konqueror.org/ " KEYWORDS="" -IUSE="+bookmarks svg X" +IUSE="X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT="test" @@ -28,6 +28,7 @@ DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep khtml) @@ -50,10 +51,6 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_kdeapps_dep kfind) - $(add_kdeapps_dep kfmclient) - $(add_kdeapps_dep kurifilter-plugins) - bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) - svg? ( $(add_kdeapps_dep svgpart '' 5.9999) ) " S="${S}/${PN}" @@ -65,10 +62,6 @@ src_prepare() { echo "add_subdirectory( doc )" >> CMakeLists.txt || die kde5_src_prepare - - # Do not install *.desktop files for kfmclient - sed -e "/kfmclient\.desktop/d" -i CMakeLists.txt \ - || die "Failed to omit .desktop files" } src_configure() { @@ -81,11 +74,21 @@ src_configure() { pkg_postinst() { kde5_pkg_postinst + if ! has_version kde-apps/keditbookmarks:${SLOT} ; then + elog "For bookmarks support, install the 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/svg:${SLOT}" + fi + if ! has_version virtual/jre ; then elog "To use Java on webpages install virtual/jre." fi