diff options
Diffstat (limited to 'dev-libs/libdbusmenu-qt')
| -rw-r--r-- | dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch | 17 | ||||
| -rw-r--r-- | 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 35df4632eae..00000000000 --- 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 73f0c1ee0cc..20f22d311f4 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) ) |