[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     4a4e5578faefb52cc3dae5d9d85fd9faeb057fc7
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 10:25:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 18:28:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4e5578

dev-util/kdevplatform: Add WEBKIT_REQUIRED=always

Also drop obsolete konsole:4 RDEPEND

Package-Manager: portage-2.2.28

 dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild | 8 ++------
 dev-util/kdevplatform/kdevplatform-1.7.3.ebuild    | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
index 74a9b52..e56305b 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
@@ -10,8 +10,7 @@ KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nl pl pt
 pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-EGIT_BRANCH="1.7"
+WEBKIT_REQUIRED="always"
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
@@ -37,11 +36,8 @@ DEPEND="${COMMON_DEPEND}
 	classbrowser? ( dev-libs/boost )
 "
 RDEPEND="${COMMON_DEPEND}
-	konsole? ( || (
-		$(add_kdeapps_dep konsolepart)
-		$(add_kdeapps_dep konsole)
-	) )
 	cvs? ( dev-vcs/cvs )
+	konsole? ( $(add_kdeapps_dep konsolepart) )
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 "
 

diff --git a/dev-util/kdevplatform/kdevplatform-1.7.3.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.3.ebuild
index 0c3892b..f4ccb79 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.3.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.3.ebuild
@@ -10,6 +10,7 @@ KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nl pl pt
 pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
+WEBKIT_REQUIRED="always"
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
@@ -35,11 +36,8 @@ DEPEND="${COMMON_DEPEND}
 	classbrowser? ( dev-libs/boost )
 "
 RDEPEND="${COMMON_DEPEND}
-	konsole? ( || (
-		$(add_kdeapps_dep konsolepart)
-		$(add_kdeapps_dep konsole)
-	) )
 	cvs? ( dev-vcs/cvs )
+	konsole? ( $(add_kdeapps_dep konsolepart) )
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 "