commit: b1e2edb7265f0c057bda6a6da41334be78238427 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Mon Mar 2 18:33:22 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Mon Mar 2 18:33:22 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b1e2edb7
[kde-apps/dolphin] Frameworks merged to master Package-Manager: portage-2.2.17 --- kde-apps/dolphin/dolphin-5.9999.ebuild | 67 ------------------------------ kde-apps/dolphin/dolphin-9999.ebuild | 75 +++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 100 deletions(-) diff --git a/kde-apps/dolphin/dolphin-5.9999.ebuild b/kde-apps/dolphin/dolphin-5.9999.ebuild deleted file mode 100644 index d83b11a..0000000 --- a/kde-apps/dolphin/dolphin-5.9999.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -EGIT_BRANCH="frameworks" -KDE_HANDBOOK="true" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Plasma filemanager focusing on usability" -HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin"; -KEYWORDS="" -IUSE="semantic-desktop" - -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/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/phonon[qt5] - semantic-desktop? ( - $(add_plasma_dep baloo) - $(add_plasma_dep baloo-widgets) - $(add_plasma_dep kfilemetadata) - ) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kio-extras) -" - -RESTRICT="test" - -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) - ) - - kde5_src_configure -} diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild index 65dfd24..b506536 100644 --- a/kde-apps/dolphin/dolphin-9999.ebuild +++ b/kde-apps/dolphin/dolphin-9999.ebuild @@ -4,54 +4,63 @@ EAPI=5 -KDE_HANDBOOK="optional" -KMNAME="kde-baseapps" -inherit kde4-meta +KDE_HANDBOOK="true" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 -DESCRIPTION="A KDE filemanager focusing on usability" +DESCRIPTION="Plasma filemanager focusing on usability" HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin"; KEYWORDS="" -IUSE="debug semantic-desktop thumbnail" +IUSE="semantic-desktop" DEPEND=" - $(add_kdebase_dep kactivities '' 4.13) - $(add_kdeapps_dep libkonq) - media-libs/phonon[qt4] - x11-libs/libXrender + $(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/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/phonon[qt5] semantic-desktop? ( - $(add_kdebase_dep baloo) - $(add_kdebase_dep baloo-widgets) - $(add_kdebase_dep kfilemetadata) + $(add_plasma_dep baloo) + $(add_plasma_dep baloo-widgets) + $(add_plasma_dep kfilemetadata) ) " RDEPEND="${DEPEND} - $(add_kdeapps_dep kfind) - thumbnail? ( - $(add_kdeapps_dep thumbnailers) - || ( - $(add_kdeapps_dep ffmpegthumbs) - $(add_kdeapps_dep mplayerthumbs) - ) - ) + $(add_plasma_dep kio-extras) " RESTRICT="test" -# bug 393129 src_configure() { local mycmakeargs=( - $(cmake-utils_use_with semantic-desktop Baloo) - $(cmake-utils_use_with semantic-desktop BalooWidgets) - $(cmake-utils_use_with semantic-desktop KFileMetaData) + $(cmake-utils_use_with semantic-desktop KF5Baloo) + $(cmake-utils_use_with semantic-desktop KF5BalooWidgets) + $(cmake-utils_use_with semantic-desktop KF5FileMetaData) ) - 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 + kde5_src_configure }
