commit: 285191b937d56d4f93832b83e1d98fdbc86a28be
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 20:19:49 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 20:19:49 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=285191b9
[kde-apps/dolphin-plugins] Frameworks merged to master
.../dolphin-plugins/dolphin-plugins-5.9999.ebuild | 44 ----------------------
.../dolphin-plugins/dolphin-plugins-9999.ebuild | 19 +++++++---
2 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-5.9999.ebuild
b/kde-apps/dolphin-plugins/dolphin-plugins-5.9999.ebuild
deleted file mode 100644
index f857aa4..0000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-5.9999.ebuild
+++ /dev/null
@@ -1,44 +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="false"
-inherit kde5
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS=""
-IUSE="bazaar dropbox git subversion"
-
-DEPEND="
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep dolphin)
- $(add_kdeapps_dep libkonq)
- dev-qt/qtnetwork
- dev-qt/qtwidgets
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep kompare)
- bazaar? ( dev-vcs/bzr )
- dropbox? ( net-misc/dropbox-cli )
- git? ( dev-vcs/git )
- subversion? ( dev-vcs/subversion )
-"
-
-src_install() {
- { use bazaar || use dropbox || use git || use subversion; } &&
kde5_src_install
-}
-
-pkg_postinst() {
- if ! use bazaar && ! use dropbox && ! use git && ! use subversion ; then
- einfo
- einfo "You have disabled all plugin use flags. If you want to
have vcs"
- einfo "integration in dolphin, enable those of your needs."
- einfo
- fi
-}
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
b/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
index d9f1852..f857aa4 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -4,29 +4,38 @@
EAPI=5
-inherit kde4-base
+EGIT_BRANCH="frameworks"
+KDE_HANDBOOK="false"
+inherit kde5
DESCRIPTION="Extra Dolphin plugins"
KEYWORDS=""
-IUSE="debug bazaar git mercurial subversion"
+IUSE="bazaar dropbox git subversion"
DEPEND="
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep dolphin)
$(add_kdeapps_dep libkonq)
+ dev-qt/qtnetwork
+ dev-qt/qtwidgets
"
RDEPEND="${DEPEND}
$(add_kdeapps_dep kompare)
bazaar? ( dev-vcs/bzr )
+ dropbox? ( net-misc/dropbox-cli )
git? ( dev-vcs/git )
- mercurial? ( dev-vcs/mercurial )
subversion? ( dev-vcs/subversion )
"
src_install() {
- { use bazaar || use git || use mercurial || use subversion; } &&
kde4-base_src_install
+ { use bazaar || use dropbox || use git || use subversion; } &&
kde5_src_install
}
pkg_postinst() {
- if ! use bazaar && ! use git && ! use mercurial && ! use subversion ;
then
+ if ! use bazaar && ! use dropbox && ! use git && ! use subversion ; then
einfo
einfo "You have disabled all plugin use flags. If you want to
have vcs"
einfo "integration in dolphin, enable those of your needs."
