From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AC5FB138CCF for ; Sat, 23 May 2015 16:13:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4DB6E0AA5; Sat, 23 May 2015 16:13:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8935E0AA2 for ; Sat, 23 May 2015 16:13:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 84DC5340DA5 for ; Sat, 23 May 2015 16:13:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 058CBA03 for ; Sat, 23 May 2015 16:13:04 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1432397568.5d3c16fce2d1037cea7962bf17fa75516524f55c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/dolphin/dolphin-15.04.49.9999.ebuild X-VCS-Directories: kde-apps/dolphin/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5d3c16fce2d1037cea7962bf17fa75516524f55c X-VCS-Branch: master Date: Sat, 23 May 2015 16:13:04 +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: dcd2536e-6645-4260-9290-0664e47473a8 X-Archives-Hash: 59f706df7cb3f94a67993eb918c9dbc2 commit: 5d3c16fce2d1037cea7962bf17fa75516524f55c Author: Andreas Sturmlechner gmail com> AuthorDate: Wed May 20 20:08:47 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat May 23 16:12:48 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d3c16fc [kde-apps/dolphin] Stable branch still KDE4-based Package-Manager: portage-2.2.20 kde-apps/dolphin/dolphin-15.04.49.9999.ebuild | 76 ++++++++++++--------------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/kde-apps/dolphin/dolphin-15.04.49.9999.ebuild b/kde-apps/dolphin/dolphin-15.04.49.9999.ebuild index 719188b..65dfd24 100644 --- a/kde-apps/dolphin/dolphin-15.04.49.9999.ebuild +++ b/kde-apps/dolphin/dolphin-15.04.49.9999.ebuild @@ -4,64 +4,54 @@ EAPI=5 -KDE_HANDBOOK="true" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 +KDE_HANDBOOK="optional" +KMNAME="kde-baseapps" +inherit kde4-meta -DESCRIPTION="Plasma filemanager focusing on usability" +DESCRIPTION="A KDE filemanager focusing on usability" HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin" KEYWORDS="" -IUSE="semantic-desktop" +IUSE="debug semantic-desktop thumbnail" DEPEND=" - $(add_frameworks_dep kactivities) - $(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 ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - dev-qt/qtconcurrent:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/phonon[qt5] + $(add_kdebase_dep kactivities '' 4.13) + $(add_kdeapps_dep libkonq) + media-libs/phonon[qt4] + x11-libs/libXrender semantic-desktop? ( - $(add_plasma_dep baloo) - $(add_plasma_dep baloo-widgets) - $(add_plasma_dep kfilemetadata) + $(add_kdebase_dep baloo) + $(add_kdebase_dep baloo-widgets) + $(add_kdebase_dep kfilemetadata) ) " RDEPEND="${DEPEND} - $(add_plasma_dep kio-extras) + $(add_kdeapps_dep kfind) + thumbnail? ( + $(add_kdeapps_dep thumbnailers) + || ( + $(add_kdeapps_dep ffmpegthumbs) + $(add_kdeapps_dep mplayerthumbs) + ) + ) " RESTRICT="test" +# bug 393129 src_configure() { local mycmakeargs=( - $(cmake-utils_use_with semantic-desktop KF5Baloo) - $(cmake-utils_use_with semantic-desktop KF5BalooWidgets) - $(cmake-utils_use_with semantic-desktop KF5FileMetaData) + $(cmake-utils_use_with semantic-desktop Baloo) + $(cmake-utils_use_with semantic-desktop BalooWidgets) + $(cmake-utils_use_with semantic-desktop KFileMetaData) ) - kde5_src_configure + kde4-meta_src_configure +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if ! has_version media-gfx/icoutils ; then + elog "For .exe file preview support, install media-gfx/icoutils." + fi }