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 E156D138334 for ; Sun, 23 Dec 2018 17:19:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3ECFE09F9; Sun, 23 Dec 2018 17:19:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 999ABE09F6 for ; Sun, 23 Dec 2018 17:19:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79FDF335CCB for ; Sun, 23 Dec 2018 17:19:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F3AC4FC for ; Sun, 23 Dec 2018 17:19:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1545585135.a7b7e118a3e302239500d3b8170912a64c69eb2a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-9999.ebuild X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a7b7e118a3e302239500d3b8170912a64c69eb2a X-VCS-Branch: master Date: Sun, 23 Dec 2018 17:19:29 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e34e67c3-6590-4842-a03c-ea1a001dd6d0 X-Archives-Hash: 885988041d2aeda50f3527ae1df8119a commit: a7b7e118a3e302239500d3b8170912a64c69eb2a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 23 17:08:47 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 23 17:12:15 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7b7e118 media-gfx/digikam: libmediawiki was merged into digikam Upstream commit e4bc0da59fc5321cc3b63655e1fa7f7b1aa4fe81 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-9999.ebuild | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index 741d546613..12a3a7db4a 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -41,6 +41,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) $(add_qt_dep qtsql 'mysql?') $(add_qt_dep qtwidgets) @@ -66,7 +67,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kbookmarks) $(add_kdeapps_dep marble) $(add_qt_dep qtconcurrent) - $(add_qt_dep qtnetwork) ) mediaplayer? ( media-libs/qtav[opengl] @@ -116,14 +116,6 @@ pkg_setup() { } # FIXME: Unbundle libraw (libs/rawengine/libraw) -src_prepare() { - if ! use marble; then - punt_bogus_dep Qt5 Network - fi - - kde5_src_prepare -} - src_configure() { local mycmakeargs=( -DENABLE_APPSTYLES=ON