[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-php/files/, dev-util/kdevelop-php/

[Vadim A. Misbakh-Soloviov]

commit:     47fae4571848c5aaf4c01f6e0782c56f424b255b
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Tue Jan 13 14:50:06 2015 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Tue Jan 13 14:50:06 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=47fae457

[dev-util/kdevelop-php] Fix KDevelop4 plugin

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch | 10 +++++-----
 dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild             |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch 
b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
index 4e64c9f..cbc1cf2 100644
--- a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
@@ -2,11 +2,11 @@ diff -ruN kdevelop-php-1.2.0.orig/parser/CMakeLists.txt 
kdevelop-php-1.2.0/parse
 --- kdevelop-php-1.2.0.orig/parser/CMakeLists.txt      2011-01-23 
20:42:54.000000000 +0100
 +++ kdevelop-php-1.2.0/parser/CMakeLists.txt   2011-04-25 22:29:05.486182541 
+0200
 @@ -21,6 +21,8 @@
-     ${KDE4_KTEXTEDITOR_LIBS}
+ target_link_libraries(kdevphpparser LINK_PRIVATE
+     KDev::Language
  )
- 
-+add_dependencies( kdev4phpparser php-parser-generated )
 +
- kde4_add_executable( php-parser main.cpp )
- target_link_libraries(php-parser ${QT_QTCORE_LIBRARY} 
${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} 
kdev4phpparser)
++add_dependencies( kdev4phpparser php-parser-generated )
+ 
+ add_executable( php-parser main.cpp )
  

diff --git a/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild 
b/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild
index 45673a0..cbcccd8 100644
--- a/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-4.9999.ebuild
@@ -10,6 +10,7 @@ VIRTUALX_REQUIRED=test
 KDEBASE="kdevelop"
 KMNAME="kdev-php"
 EGIT_REPONAME="${KMNAME}"
+EGIT_BRANCH="1.7"
 inherit kde4-base
 
 DESCRIPTION="PHP plugin for KDevelop 4"
@@ -24,6 +25,7 @@ RESTRICT="test"
 
 DEPEND="
        >=dev-util/kdevelop-pg-qt-1.0.0
+       <=dev-util/kdevelop-pg-qt-5
 "
 RDEPEND="
        dev-util/kdevelop:${SLOT}