| 1 |
commit: d7d6cd5a65dfe14349552080e67bf779753fc55a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 9 08:49:46 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 9 08:49:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7d6cd5a |
| 7 |
|
| 8 |
kde-plasma/kmenuedit: Fix DEPENDs, set KDE_HANDBOOK=forceoptional |
| 9 |
|
| 10 |
Upstream commit 431cfc8afd07631bce09282d7c1bee9880dbe781 |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 14 |
|
| 15 |
kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild | 9 ++++++--- |
| 16 |
kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild | 9 ++++++--- |
| 17 |
kde-plasma/kmenuedit/kmenuedit-9999.ebuild | 11 +++++++---- |
| 18 |
3 files changed, 19 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild |
| 21 |
index 2aff7db66f..80d15906b3 100644 |
| 22 |
--- a/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild |
| 23 |
+++ b/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild |
| 24 |
@@ -3,7 +3,7 @@ |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
|
| 28 |
-KDE_HANDBOOK="true" |
| 29 |
+KDE_HANDBOOK="forceoptional" |
| 30 |
inherit kde5 |
| 31 |
|
| 32 |
DESCRIPTION="KDE Plasma menu editor" |
| 33 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git" |
| 34 |
KEYWORDS="~amd64 ~arm ~x86" |
| 35 |
IUSE="+hotkeys" |
| 36 |
|
| 37 |
-DEPEND=" |
| 38 |
+COMMON_DEPEND=" |
| 39 |
$(add_frameworks_dep kcompletion) |
| 40 |
$(add_frameworks_dep kconfig) |
| 41 |
$(add_frameworks_dep kconfigwidgets) |
| 42 |
@@ -31,7 +31,10 @@ DEPEND=" |
| 43 |
$(add_qt_dep qtxml) |
| 44 |
hotkeys? ( $(add_plasma_dep khotkeys) ) |
| 45 |
" |
| 46 |
-RDEPEND="${DEPEND} |
| 47 |
+DEPEND="${COMMON_DEPEND} |
| 48 |
+ $(add_frameworks_dep kinit) |
| 49 |
+" |
| 50 |
+RDEPEND="${COMMON_DEPEND} |
| 51 |
!kde-plasma/kmenuedit:4 |
| 52 |
" |
| 53 |
|
| 54 |
|
| 55 |
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild |
| 56 |
index 83dfbbaa73..760e7483ea 100644 |
| 57 |
--- a/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild |
| 58 |
+++ b/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild |
| 59 |
@@ -3,7 +3,7 @@ |
| 60 |
|
| 61 |
EAPI=6 |
| 62 |
|
| 63 |
-KDE_HANDBOOK="true" |
| 64 |
+KDE_HANDBOOK="forceoptional" |
| 65 |
inherit kde5 |
| 66 |
|
| 67 |
DESCRIPTION="KDE Plasma menu editor" |
| 68 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git" |
| 69 |
KEYWORDS="" |
| 70 |
IUSE="+hotkeys" |
| 71 |
|
| 72 |
-DEPEND=" |
| 73 |
+COMMON_DEPEND=" |
| 74 |
$(add_frameworks_dep kcompletion) |
| 75 |
$(add_frameworks_dep kconfig) |
| 76 |
$(add_frameworks_dep kconfigwidgets) |
| 77 |
@@ -31,7 +31,10 @@ DEPEND=" |
| 78 |
$(add_qt_dep qtxml) |
| 79 |
hotkeys? ( $(add_plasma_dep khotkeys) ) |
| 80 |
" |
| 81 |
-RDEPEND="${DEPEND} |
| 82 |
+DEPEND="${COMMON_DEPEND} |
| 83 |
+ $(add_frameworks_dep kinit) |
| 84 |
+" |
| 85 |
+RDEPEND="${COMMON_DEPEND} |
| 86 |
!kde-plasma/kmenuedit:4 |
| 87 |
" |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild |
| 91 |
index ea1055b39d..760e7483ea 100644 |
| 92 |
--- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild |
| 93 |
+++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild |
| 94 |
@@ -1,9 +1,9 @@ |
| 95 |
-# Copyright 1999-2018 Gentoo Foundation |
| 96 |
+# Copyright 1999-2018 Gentoo Authors |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=6 |
| 100 |
|
| 101 |
-KDE_HANDBOOK="true" |
| 102 |
+KDE_HANDBOOK="forceoptional" |
| 103 |
inherit kde5 |
| 104 |
|
| 105 |
DESCRIPTION="KDE Plasma menu editor" |
| 106 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git" |
| 107 |
KEYWORDS="" |
| 108 |
IUSE="+hotkeys" |
| 109 |
|
| 110 |
-DEPEND=" |
| 111 |
+COMMON_DEPEND=" |
| 112 |
$(add_frameworks_dep kcompletion) |
| 113 |
$(add_frameworks_dep kconfig) |
| 114 |
$(add_frameworks_dep kconfigwidgets) |
| 115 |
@@ -31,7 +31,10 @@ DEPEND=" |
| 116 |
$(add_qt_dep qtxml) |
| 117 |
hotkeys? ( $(add_plasma_dep khotkeys) ) |
| 118 |
" |
| 119 |
-RDEPEND="${DEPEND} |
| 120 |
+DEPEND="${COMMON_DEPEND} |
| 121 |
+ $(add_frameworks_dep kinit) |
| 122 |
+" |
| 123 |
+RDEPEND="${COMMON_DEPEND} |
| 124 |
!kde-plasma/kmenuedit:4 |
| 125 |
" |
Archives