| 1 |
commit: 0ac8c79ac8a65baa53d635b444b9c66486144f26 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 5 16:02:56 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 5 20:24:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ac8c79a |
| 7 |
|
| 8 |
[kde-apps/kwalletmanager] Frameworks merged to master |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.18 |
| 11 |
|
| 12 |
.../kwalletmanager/kwalletmanager-5.9999.ebuild | 41 -------------------- |
| 13 |
kde-apps/kwalletmanager/kwalletmanager-9999.ebuild | 44 +++++++++++++++------- |
| 14 |
sets/kde-applications-live | 1 - |
| 15 |
sets/kdeutils-live | 1 + |
| 16 |
4 files changed, 32 insertions(+), 55 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild |
| 19 |
deleted file mode 100644 |
| 20 |
index 2a4f139..0000000 |
| 21 |
--- a/kde-apps/kwalletmanager/kwalletmanager-5.9999.ebuild |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,41 +0,0 @@ |
| 24 |
-# Copyright 1999-2015 Gentoo Foundation |
| 25 |
-# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: $ |
| 27 |
- |
| 28 |
-EAPI=5 |
| 29 |
- |
| 30 |
-KDE_BLOCK_SLOT4="false" |
| 31 |
-KDE_HANDBOOK="true" |
| 32 |
-EGIT_BRANCH="frameworks" |
| 33 |
-inherit kde5 |
| 34 |
- |
| 35 |
-DESCRIPTION="KDE Wallet management tool" |
| 36 |
-KEYWORDS="" |
| 37 |
-IUSE="" |
| 38 |
- |
| 39 |
-DEPEND=" |
| 40 |
- $(add_frameworks_dep kauth) |
| 41 |
- $(add_frameworks_dep kcmutils) |
| 42 |
- $(add_frameworks_dep kcodecs) |
| 43 |
- $(add_frameworks_dep kconfig) |
| 44 |
- $(add_frameworks_dep kconfigwidgets) |
| 45 |
- $(add_frameworks_dep kcoreaddons) |
| 46 |
- $(add_frameworks_dep kdbusaddons) |
| 47 |
- $(add_frameworks_dep kdelibs4support) |
| 48 |
- $(add_frameworks_dep ki18n) |
| 49 |
- $(add_frameworks_dep kiconthemes) |
| 50 |
- $(add_frameworks_dep kitemviews) |
| 51 |
- $(add_frameworks_dep knotifications) |
| 52 |
- $(add_frameworks_dep kservice) |
| 53 |
- $(add_frameworks_dep ktextwidgets) |
| 54 |
- $(add_frameworks_dep kwallet) |
| 55 |
- $(add_frameworks_dep kwidgetsaddons) |
| 56 |
- $(add_frameworks_dep kxmlgui) |
| 57 |
- dev-qt/qtdbus:5 |
| 58 |
- dev-qt/qtgui:5 |
| 59 |
- dev-qt/qtwidgets:5 |
| 60 |
- dev-qt/qtxml:5 |
| 61 |
-" |
| 62 |
-RDEPEND="${DEPEND} |
| 63 |
- !kde-apps/kwalletmanager:4[-minimal(-)] |
| 64 |
-" |
| 65 |
|
| 66 |
diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild |
| 67 |
index 66833c7..91d9d75 100644 |
| 68 |
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild |
| 69 |
+++ b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild |
| 70 |
@@ -4,19 +4,37 @@ |
| 71 |
|
| 72 |
EAPI=5 |
| 73 |
|
| 74 |
-KDE_HANDBOOK="optional" |
| 75 |
-inherit kde4-base |
| 76 |
+KDE_BLOCK_SLOT4="false" |
| 77 |
+KDE_HANDBOOK="true" |
| 78 |
+inherit kde5 |
| 79 |
|
| 80 |
-DESCRIPTION="KDE Wallet Management Tool" |
| 81 |
-HOMEAGE="http://www.kde.org/applications/system/kwalletmanager |
| 82 |
-http://utils.kde.org/projects/kwalletmanager" |
| 83 |
+DESCRIPTION="KDE Wallet management tool" |
| 84 |
KEYWORDS="" |
| 85 |
-IUSE="debug minimal" |
| 86 |
+IUSE="" |
| 87 |
|
| 88 |
-src_install() { |
| 89 |
- kde4-base_src_install |
| 90 |
- |
| 91 |
- if use minimal ; then |
| 92 |
- rm -r "${D}"/usr/share/icons |
| 93 |
- fi |
| 94 |
-} |
| 95 |
+DEPEND=" |
| 96 |
+ $(add_frameworks_dep kauth) |
| 97 |
+ $(add_frameworks_dep kcmutils) |
| 98 |
+ $(add_frameworks_dep kcodecs) |
| 99 |
+ $(add_frameworks_dep kconfig) |
| 100 |
+ $(add_frameworks_dep kconfigwidgets) |
| 101 |
+ $(add_frameworks_dep kcoreaddons) |
| 102 |
+ $(add_frameworks_dep kdbusaddons) |
| 103 |
+ $(add_frameworks_dep kdelibs4support) |
| 104 |
+ $(add_frameworks_dep ki18n) |
| 105 |
+ $(add_frameworks_dep kiconthemes) |
| 106 |
+ $(add_frameworks_dep kitemviews) |
| 107 |
+ $(add_frameworks_dep knotifications) |
| 108 |
+ $(add_frameworks_dep kservice) |
| 109 |
+ $(add_frameworks_dep ktextwidgets) |
| 110 |
+ $(add_frameworks_dep kwallet) |
| 111 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 112 |
+ $(add_frameworks_dep kxmlgui) |
| 113 |
+ dev-qt/qtdbus:5 |
| 114 |
+ dev-qt/qtgui:5 |
| 115 |
+ dev-qt/qtwidgets:5 |
| 116 |
+ dev-qt/qtxml:5 |
| 117 |
+" |
| 118 |
+RDEPEND="${DEPEND} |
| 119 |
+ !kde-apps/kwalletmanager:4[-minimal(-)] |
| 120 |
+" |
| 121 |
|
| 122 |
diff --git a/sets/kde-applications-live b/sets/kde-applications-live |
| 123 |
index f1a6f06..8f00aa4 100644 |
| 124 |
--- a/sets/kde-applications-live |
| 125 |
+++ b/sets/kde-applications-live |
| 126 |
@@ -2,7 +2,6 @@ |
| 127 |
~kde-apps/ark-5.9999 |
| 128 |
~kde-apps/kfind-5.9999 |
| 129 |
~kde-apps/ksnapshot-5.9999 |
| 130 |
-~kde-apps/kwalletmanager-5.9999 |
| 131 |
~kde-apps/libkcddb-5.9999 |
| 132 |
~kde-apps/libkonq-5.9999 |
| 133 |
~kde-apps/okular-5.9999 |
| 134 |
|
| 135 |
diff --git a/sets/kdeutils-live b/sets/kdeutils-live |
| 136 |
index 5886947..41e9057 100644 |
| 137 |
--- a/sets/kdeutils-live |
| 138 |
+++ b/sets/kdeutils-live |
| 139 |
@@ -2,4 +2,5 @@ |
| 140 |
~kde-apps/kcalc-9999 |
| 141 |
~kde-apps/kcharselect-9999 |
| 142 |
~kde-apps/ktimer-9999 |
| 143 |
+~kde-apps/kwalletmanager-9999 |
| 144 |
~kde-apps/print-manager-9999 |
Archives