| 1 |
commit: 1a52730779d7ff066c0876c691abf32662f6cd75 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 7 20:10:05 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 7 21:08:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a527307 |
| 7 |
|
| 8 |
dev-util/kdevelop-php: Fix DEPENDs |
| 9 |
|
| 10 |
Upstream commit 577b6b59f5505f814ee4b6e622a88cbac826ee98 |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 14 |
|
| 15 |
dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild | 11 ++++++----- |
| 16 |
dev-util/kdevelop-php/kdevelop-php-9999.ebuild | 11 ++++++----- |
| 17 |
2 files changed, 12 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild |
| 20 |
index 325a97cb63..a1085ace2d 100644 |
| 21 |
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild |
| 22 |
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Foundation |
| 25 |
+# Copyright 1999-2018 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -17,15 +17,13 @@ LICENSE="GPL-2 LGPL-2" |
| 30 |
IUSE="" |
| 31 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
| 32 |
|
| 33 |
-DEPEND=" |
| 34 |
- $(add_frameworks_dep karchive) |
| 35 |
+COMMON_DEPEND=" |
| 36 |
$(add_frameworks_dep kcmutils) |
| 37 |
$(add_frameworks_dep kconfig) |
| 38 |
$(add_frameworks_dep kconfigwidgets) |
| 39 |
$(add_frameworks_dep kcoreaddons) |
| 40 |
$(add_frameworks_dep ki18n) |
| 41 |
$(add_frameworks_dep kio) |
| 42 |
- $(add_frameworks_dep kitemmodels) |
| 43 |
$(add_frameworks_dep ktexteditor) |
| 44 |
$(add_frameworks_dep kwidgetsaddons) |
| 45 |
$(add_frameworks_dep kxmlgui) |
| 46 |
@@ -35,6 +33,9 @@ DEPEND=" |
| 47 |
dev-util/kdevelop-pg-qt:5 |
| 48 |
dev-util/kdevelop:5 |
| 49 |
" |
| 50 |
-RDEPEND="${DEPEND} |
| 51 |
+RDEPEND="${COMMON_DEPEND} |
| 52 |
!dev-util/kdevelop-php-docs |
| 53 |
" |
| 54 |
+DEPEND="${COMMON_DEPEND} |
| 55 |
+ test? ( $(add_frameworks_dep karchive) ) |
| 56 |
+" |
| 57 |
|
| 58 |
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild |
| 59 |
index cca1b05fe9..74f0418a44 100644 |
| 60 |
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild |
| 61 |
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2018 Gentoo Foundation |
| 64 |
+# Copyright 1999-2018 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=6 |
| 68 |
@@ -16,15 +16,13 @@ LICENSE="GPL-2 LGPL-2" |
| 69 |
IUSE="" |
| 70 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
| 71 |
|
| 72 |
-DEPEND=" |
| 73 |
- $(add_frameworks_dep karchive) |
| 74 |
+COMMON_DEPEND=" |
| 75 |
$(add_frameworks_dep kcmutils) |
| 76 |
$(add_frameworks_dep kconfig) |
| 77 |
$(add_frameworks_dep kconfigwidgets) |
| 78 |
$(add_frameworks_dep kcoreaddons) |
| 79 |
$(add_frameworks_dep ki18n) |
| 80 |
$(add_frameworks_dep kio) |
| 81 |
- $(add_frameworks_dep kitemmodels) |
| 82 |
$(add_frameworks_dep ktexteditor) |
| 83 |
$(add_frameworks_dep kwidgetsaddons) |
| 84 |
$(add_frameworks_dep kxmlgui) |
| 85 |
@@ -34,6 +32,9 @@ DEPEND=" |
| 86 |
dev-util/kdevelop-pg-qt:5 |
| 87 |
dev-util/kdevelop:5 |
| 88 |
" |
| 89 |
-RDEPEND="${DEPEND} |
| 90 |
+RDEPEND="${COMMON_DEPEND} |
| 91 |
!dev-util/kdevelop-php-docs |
| 92 |
" |
| 93 |
+DEPEND="${COMMON_DEPEND} |
| 94 |
+ test? ( $(add_frameworks_dep karchive) ) |
| 95 |
+" |
Archives