commit: 1a52730779d7ff066c0876c691abf32662f6cd75
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 20:10:05 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 21:08:57 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a527307
dev-util/kdevelop-php: Fix DEPENDs
Upstream commit 577b6b59f5505f814ee4b6e622a88cbac826ee98
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild | 11 ++++++-----
dev-util/kdevelop-php/kdevelop-php-9999.ebuild | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild
b/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild
index 325a97cb63..a1085ace2d 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,15 +17,13 @@ LICENSE="GPL-2 LGPL-2"
IUSE=""
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-DEPEND="
- $(add_frameworks_dep karchive)
+COMMON_DEPEND="
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
@@ -35,6 +33,9 @@ DEPEND="
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
!dev-util/kdevelop-php-docs
"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(add_frameworks_dep karchive) )
+"
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index cca1b05fe9..74f0418a44 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,15 +16,13 @@ LICENSE="GPL-2 LGPL-2"
IUSE=""
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-DEPEND="
- $(add_frameworks_dep karchive)
+COMMON_DEPEND="
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
@@ -34,6 +32,9 @@ DEPEND="
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
!dev-util/kdevelop-php-docs
"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(add_frameworks_dep karchive) )
+"