Fix tests, bug 330051

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 124 insertions, 18 deletions

diff --git a/dev-util/kdevelop-php/ChangeLog b/dev-util/kdevelop-php/ChangeLog
index e4f47522ec62..fd5b7ccd033c 100644
--- a/dev-util/kdevelop-php/ChangeLog
+++ b/dev-util/kdevelop-php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop-php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.19 2011/02/25 22:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.20 2011/03/05 17:04:33 dilfridge Exp $
+
+  05 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdevelop-php-1.2.0.ebuild, +files/kdevelop-php-1.2.0-dbustests.patch:
+  Fix tests, bug 330051
 
   25 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdevelop-php-1.0.2.ebuild, kdevelop-php-1.1.2.ebuild,
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index d2a9123058ee..66ec7b0deb2b 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kdevelop-php-1.2.0-dbustests.patch 3043 RMD160 2dff23913f89a3e9569d07a05c8229a00cd3f7b7 SHA1 f2822a82fb884ce0dc9ca12d31b7aa678de8952c SHA256 049b5ad1458f4c44de5de52ae54928803dc8ec39ed348b599194c49f80cee09b
 DIST kdevelop-php-1.0.2.tar.bz2 815029 RMD160 a8ee46ecdf7fd1b46686919f985a9dbd080798ae SHA1 dd8b9e30a563c5fa9c3dc5a52d994533b1471261 SHA256 8483e99846a8649cb9f0a97f16b144f32ec183ab2a403c17bc1c042cbc9459e9
 DIST kdevelop-php-1.1.2.tar.bz2 656616 RMD160 1fcd9797586e7ddd4a8a473c0a8d23c09c7d09da SHA1 27fb5115b95b8fc7b27472e47f2125e57b2fe4e5 SHA256 5f0a5831d2b6e6427548ce185fd05f237905917c7b6f081403b75dcea1d2fb9b
 DIST kdevelop-php-1.2.0.tar.bz2 657617 RMD160 0ab382af404b32d2c154e634722d5a8c66663966 SHA1 931ebaa41ad583a4cc20655a398f414ff0ff9698 SHA256 c3255afe03a297a38e557cc9220e5b70e848ab10187c83c457aecc45f922f3c7
 EBUILD kdevelop-php-1.0.2.ebuild 661 RMD160 33635676d77208894df83b0bdd0182607a62e70f SHA1 a932b2fbf97f84aa4c2d3bb3e7e65ae0289fd426 SHA256 f175aa06d95e8fed33ba152a38ede817f9f1fd0d6d9a2d17a7bff2bc2d401b9c
 EBUILD kdevelop-php-1.1.2.ebuild 672 RMD160 c80a48ff34e8a1d07041373a0c254eeea9b4a321 SHA1 933e8bcd89afb1d81d3c78b79b9f25071457f5ee SHA256 c4adb74a65e44ac89c708f8548e9936cc722c33910548a8dcf0ae4c98c806154
-EBUILD kdevelop-php-1.2.0.ebuild 672 RMD160 6780db434e59b775b32ee1dbfee5a9955ffb422f SHA1 2880d7a87156bc776060b9c8a9d6790ad71b9b8c SHA256 fdb00ffdaa0f56ad3eceb64981f347f369be912591ff8a9f465cdc7e45c6ae4a
-MISC ChangeLog 2712 RMD160 5aac0e070e05750ce3c11a7382b016c891f50675 SHA1 cd8bac88150107e480adbcc170457b93fefdfd01 SHA256 efe59bb80460e5a0dd26792fb1c3e04e02c43df28d2e42aa71f9c98b99729654
+EBUILD kdevelop-php-1.2.0.ebuild 751 RMD160 47beb78ebd61bb69d180a5f81d3eb7acb2c27497 SHA1 75652288942e82874a582c389ec84021855ded28 SHA256 3bbed28482790eb5a9af4f51233c6681641fd1124289f7d2cfa0f0449eb6cc60
+MISC ChangeLog 2866 RMD160 ef5d9632e079e4b1d13a05248b59721a5645d845 SHA1 d6c5f0904744762537c45db11c6afecdf7fdac99 SHA256 d5271e7b5816b749ac902ee905534c730a977a7a7191b6139d097ed2c674e01b
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNaDGWAAoJENwGBM22xffeslMP+gOvk2z+Vh2qANFYUTbtZR6o
-h381iTj2uHPxheqBp64zMOrzXnlRVVQezA2kgOJE8vAvjWfKEiON+VsUNNL+DIrX
-91THn3z00RovygXLwNQ0FNZBFE7oRoamKH34op8RyTzMSf9i54kvvvFpOKM2uZEb
-680Su4khMLIcciS7/Hvip/YRUa8HuOT5nOTK3ZTT/qxIEbsbbzULJRRFADghbEo9
-ofnZjyp2B1li7pXjL3TiVYZOWuxouKw0aNINKzm4i3pgNSKvDQ0P6ixNzbbS/vX6
-tul3i1K1H88h3dBp0BIsMliNXyT+tR+qhGgRMw3XE39zcvEPP95sDtGqNyZwSI+h
-fP0QsqdH84iInyUWZSN2lIqcTcUtM2q8vwMOdar2BQyryBVX0IYJVQps+PkRaeUn
-eaV/2R4ZVcoQLWzdfgFvf5WKEoArkIq6TH+u4PWQwDThVblfvC69mFmkDZZh+ZNp
-bc1QRu7+x9vAn7o0NfqiAP5pO6jlMsId/EjXIJjCnq9SAURT3ZZsZs3TU+MgGegj
-lTAl5EgvTFkceYgzdaa+F7K7sG4JeUM8AgJ+uzb2jMjEaREMls30UOM0yRwAhXqN
-RXuvUl/L9IKWXOpgo0Yak3+jnIiMHygvQHsFYxE7yDU4eoVb3k+2zhXH+ZVRbZ7P
-HSvZotxzAJP4963K9z/A
-=d+3M
+iQIcBAEBAgAGBQJNcm2KAAoJENwGBM22xffefssP/RxSjyq+A42rOHiIURR95IRC
+J8aLbedxBDsciza0ui1h3GhnsmyZyKtP1GA/jTHsi7e1UsfXe34uS70W/BOk78pv
+LswWQoeKf2Tq4WSmp0KLAflDX6QpUU4bzScv1ALKSv/VlmSDD/8xpHByz2Ni8+tA
+t6/fi39NhXdbnPL3+WRBjm6dHcxx/QsdKmy3Fyo7dkgnqj96T3OiCyn1yEWverMK
+m7auIzpmoyrLewBvxsBohHAIVMjLSlWi2sMU6Jm8F/Hy+xufwR1TnDBCHLJAZE/A
+m02ZDw6N0nXrBvnRt9MsQeZyYAAbnCPoe8fvxA9q4Ww7b2SuK8yS3buxMC2SbAH+
+ODupZ9J2mDoI+aLSRCKeKiGtbEJ5++y9TT7Gn2RftQya8Z5TVS5sy6BBVm2WP1fm
+SgV6PvYFREbtFiIj/mFo7fu+0W6Q5Fcg0Dk3jB3DmE7SKabyxEXXASb0o8vUFj7F
+QTEN6xHqRxiiij47Vgb9QWlQ+jey4aJkaZe7lsIpxlBXgnIf8QLAhfN5upKuP5Om
+O5BYLxwzWGbJ4A/Lno1oz0LfKgQNtO/oIjYDXYJai0B2VtsKnFN5Cg50mwitlZ+4
+bslLWXeKgO4LlOKalYUJd/r0EoJflT9VBwSAdqbv26qD+N5AbjddxYP+G/77MUHh
+ereLTdnXwiBt93sgrPmb
+=lUJ6
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
new file mode 100644
index 000000000000..d3bb404c2f6a
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
@@ -0,0 +1,98 @@
+diff -ruN kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt kdevelop-php-1.2.0/completion/tests/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/completion/tests/CMakeLists.txt	2011-03-05 18:01:34.000000000 +0100
+@@ -8,24 +8,6 @@
+ 
+ set(completiontest_SRCS test_completion.cpp
+     ../../duchain/tests/duchaintestbase.cpp)
+-kde4_add_unit_test(completiontest ${completiontest_SRCS})
+-target_link_libraries(completiontest
+-    kdev4phpcompletion
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(completionbench_SRCS bench_completion.cpp
+     ../../duchain/tests/duchaintestbase.cpp)
+-kde4_add_unit_test(completionbenchmark ${completionbench_SRCS})
+-target_link_libraries(completionbenchmark
+-    kdev4phpcompletion
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt	2011-03-05 17:54:27.000000000 +0100
+@@ -9,66 +9,21 @@
+ set(duchain_SRCS
+     duchain.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(duchain ${duchain_SRCS})
+-target_link_libraries(duchain
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+-
+ 
+ set(expressionparser_SRCS
+     expressionparser.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(expressionparser ${expressionparser_SRCS})
+-target_link_libraries(expressionparser
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(uses_SRCS
+     uses.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(uses ${uses_SRCS})
+-target_link_libraries(uses
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(benchmarks_SRCS
+     benchmarks.cpp
+     duchaintestbase.cpp
+ )
+-kde4_add_unit_test(benchmarks ${benchmarks_SRCS})
+-target_link_libraries(benchmarks
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+-
+ 
+ set(duchain_multiplefiles_SRCS
+     duchain_multiplefiles.cpp
+     duchaintestbase.cpp
+ )
+-kde4_add_unit_test(duchain_multiplefiles ${duchain_multiplefiles_SRCS})
+-target_link_libraries(duchain_multiplefiles
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
index 90f07aeda895..40a33dc46d4c 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild,v 1.2 2011/02/25 22:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild,v 1.3 2011/03/05 17:04:33 dilfridge Exp $
 
 EAPI=3
 
 # Bug 330051
-RESTRICT="test"
+# RESTRICT="test"
 
 KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nds nl pt pt_BR sv th uk zh_CN zh_TW"
 
 KMNAME="kdevelop"
 KMMODULE="php"
 KDEVELOP_VERSION="4.2.0"
+VIRTUALX_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="PHP plugin for KDevelop 4"
@@ -27,3 +28,5 @@ RDEPEND="
 	dev-util/kdevelop
 	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
 "
+
+PATCHES=( "${FILESDIR}/${P}"-dbustests.patch )