commit: 0ac8c79ac8a65baa53d635b444b9c66486144f26
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 5 16:02:56 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 5 20:24:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ac8c79a
[kde-apps/kwalletmanager] Frameworks merged to master
Package-Manager: portage-2.2.18
.../kwalletmanager/kwalletmanager-5.9999.ebuild | 41 --------------------
kde-apps/kwalletmanager/kwalletmanager-9999.ebuild | 44 +++++++++++++++-------
sets/kde-applications-live | 1 -
sets/kdeutils-live | 1 +
4 files changed, 32 insertions(+), 55 deletions(-)
diff --git a/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild
b/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild
deleted file mode 100644
index 2a4f139..0000000
--- a/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="true"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="KDE Wallet management tool"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kauth)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kwalletmanager:4[-minimal(-)]
-"
diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
index 66833c7..91d9d75 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
@@ -4,19 +4,37 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="true"
+inherit kde5
-DESCRIPTION="KDE Wallet Management Tool"
-HOMEAGE="http://www.kde.org/applications/system/kwalletmanager
-http://utils.kde.org/projects/kwalletmanager";
+DESCRIPTION="KDE Wallet management tool"
KEYWORDS=""
-IUSE="debug minimal"
+IUSE=""
-src_install() {
- kde4-base_src_install
-
- if use minimal ; then
- rm -r "${D}"/usr/share/icons
- fi
-}
+DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kwalletmanager:4[-minimal(-)]
+"
diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index f1a6f06..8f00aa4 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -2,7 +2,6 @@
~kde-apps/ark-5.9999
~kde-apps/kfind-5.9999
~kde-apps/ksnapshot-5.9999
-~kde-apps/kwalletmanager-5.9999
~kde-apps/libkcddb-5.9999
~kde-apps/libkonq-5.9999
~kde-apps/okular-5.9999
diff --git a/sets/kdeutils-live b/sets/kdeutils-live
index 5886947..41e9057 100644
--- a/sets/kdeutils-live
+++ b/sets/kdeutils-live
@@ -2,4 +2,5 @@
~kde-apps/kcalc-9999
~kde-apps/kcharselect-9999
~kde-apps/ktimer-9999
+~kde-apps/kwalletmanager-9999
~kde-apps/print-manager-9999
