[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/

[Michael Palimaka]

commit:     ecdc17976494626862d53dcaca26983e08e6c76e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  1 15:45:04 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct  1 15:45:04 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ecdc1797

[dev-libs/libdbusmenu-qt] Fix configure when test deps are not present wrt bug #524174

Package-Manager: portage-2.2.10

---
 .../files/libdbusmenu-qt-0.9.2-optionaltests.patch      | 17 -----------------
 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild      |  9 +++++++--
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
deleted file mode 100644
index 35df463..0000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -59,8 +59,13 @@
-     DESTINATION lib${LIB_SUFFIX}/pkgconfig
-     )
- 
-+
-+option(BUILD_TESTS "Build tests" ON)
-+
- add_subdirectory(src)
--add_subdirectory(tests)
-+if(BUILD_TESTS)
-+    add_subdirectory(tests)
-+endif(BUILD_TESTS)
- add_subdirectory(tools)
- 
- if(WITH_DOC)

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index 73f0c1e..20f22d3 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -50,7 +50,6 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( NEWS README )
-PATCHES=( "${FILESDIR}/${PN}-0.9.2-optionaltests.patch" )
 
 # tests fail due to missing conection to dbus
 RESTRICT="test"
@@ -61,10 +60,16 @@ pkg_setup() {
 	use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
 }
 
+src_prepare() {
+	[[ ${PV} == 9999* ]] && bzr_src_prepare
+	cmake-utils_src_prepare
+
+	use test || comment_add_subdirectory tests
+}
+
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=(
-			$(cmake-utils_use_build test TESTS)
 			$(cmake-utils_use_with doc)
 		)