From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1050963-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10C05138334 for <garchives@archives.gentoo.org>; Sun, 7 Oct 2018 23:27:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0168DE087B; Sun, 7 Oct 2018 23:27:55 +0000 (UTC) Received: from smtp.gentoo.org (unknown [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2B01E087B for <gentoo-commits@lists.gentoo.org>; Sun, 7 Oct 2018 23:27:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DF18335C7F for <gentoo-commits@lists.gentoo.org>; Sun, 7 Oct 2018 23:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6FDF3F8 for <gentoo-commits@lists.gentoo.org>; Sun, 7 Oct 2018 23:27:30 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1538946537.1a52730779d7ff066c0876c691abf32662f6cd75.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-php/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop-php/kdevelop-php-5.3.9999.ebuild dev-util/kdevelop-php/kdevelop-php-9999.ebuild X-VCS-Directories: dev-util/kdevelop-php/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1a52730779d7ff066c0876c691abf32662f6cd75 X-VCS-Branch: master Date: Sun, 7 Oct 2018 23:27:30 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a2a9bec0-76bd-47b4-bc76-3b9f06ed5009 X-Archives-Hash: 50af9f5761271501d8b8668d6c1edad7 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) ) +"