commit: cb7d6c357130507c198001d19f578cc905f8852d Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Feb 18 00:45:09 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Feb 18 06:37:26 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb7d6c35
[kde-apps/dolphin] Tests optional patch upstreamed Block by eclass, s/KDE/Plasma/ Package-Manager: portage-2.2.17 --- kde-apps/dolphin/dolphin-5.9999.ebuild | 5 +---- kde-apps/dolphin/files/dolphin-5.9999-tests-optional.patch | 11 ----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/kde-apps/dolphin/dolphin-5.9999.ebuild b/kde-apps/dolphin/dolphin-5.9999.ebuild index 2953627..3700424 100644 --- a/kde-apps/dolphin/dolphin-5.9999.ebuild +++ b/kde-apps/dolphin/dolphin-5.9999.ebuild @@ -11,7 +11,7 @@ KDE_TEST="true" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="KDE filemanager focusing on usability" +DESCRIPTION="Plasma filemanager focusing on usability" HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin"; KEYWORDS="" IUSE="semantic-desktop" @@ -53,11 +53,8 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_plasma_dep kio-extras) - !kde-base/dolphin:4 " -PATCHES=( "${FILESDIR}/${PN}-5.9999-tests-optional.patch" ) - S=${S}/${PN} src_configure() { diff --git a/kde-apps/dolphin/files/dolphin-5.9999-tests-optional.patch b/kde-apps/dolphin/files/dolphin-5.9999-tests-optional.patch deleted file mode 100644 index 43aa648..0000000 --- a/kde-apps/dolphin/files/dolphin-5.9999-tests-optional.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/CMakeLists.txt 2015-01-19 02:45:45.207037408 +0100 -+++ b/src/CMakeLists.txt 2015-01-19 02:52:38.558025089 +0100 -@@ -334,4 +334,7 @@ - install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} ) - install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} ) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+ add_subdirectory(tests) -+endif()
