commit: d7d6cd5a65dfe14349552080e67bf779753fc55a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Oct 9 08:49:46 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Oct 9 08:49:53 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7d6cd5a
kde-plasma/kmenuedit: Fix DEPENDs, set KDE_HANDBOOK=forceoptional Upstream commit 431cfc8afd07631bce09282d7c1bee9880dbe781 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild | 9 ++++++--- kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild | 9 ++++++--- kde-plasma/kmenuedit/kmenuedit-9999.ebuild | 11 +++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild index 2aff7db66f..80d15906b3 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.14.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="KDE Plasma menu editor" @@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git"; KEYWORDS="~amd64 ~arm ~x86" IUSE="+hotkeys" -DEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -31,7 +31,10 @@ DEPEND=" $(add_qt_dep qtxml) hotkeys? ( $(add_plasma_dep khotkeys) ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kinit) +" +RDEPEND="${COMMON_DEPEND} !kde-plasma/kmenuedit:4 " diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild index 83dfbbaa73..760e7483ea 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.14.49.9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="KDE Plasma menu editor" @@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git"; KEYWORDS="" IUSE="+hotkeys" -DEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -31,7 +31,10 @@ DEPEND=" $(add_qt_dep qtxml) hotkeys? ( $(add_plasma_dep khotkeys) ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kinit) +" +RDEPEND="${COMMON_DEPEND} !kde-plasma/kmenuedit:4 " diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild index ea1055b39d..760e7483ea 100644 --- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="KDE Plasma menu editor" @@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git"; KEYWORDS="" IUSE="+hotkeys" -DEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -31,7 +31,10 @@ DEPEND=" $(add_qt_dep qtxml) hotkeys? ( $(add_plasma_dep khotkeys) ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kinit) +" +RDEPEND="${COMMON_DEPEND} !kde-plasma/kmenuedit:4 "
