[gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/, kde-apps/okular/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     e94bc0a13ca9dde47fa0d4348e7a9de174fded27
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 17:48:07 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 17:48:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e94bc0a1

[kde-apps/okular] Punt bogus deps wrt bug #546118.

Package-Manager: portage-2.2.18

 .../okular/files/okular-5.9999-tests-optional.patch | 21 ---------------------
 kde-apps/okular/okular-5.9999.ebuild                |  8 +-------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/kde-apps/okular/files/okular-5.9999-tests-optional.patch b/kde-apps/okular/files/okular-5.9999-tests-optional.patch
deleted file mode 100644
index 309c092..0000000
--- a/kde-apps/okular/files/okular-5.9999-tests-optional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt	2015-02-23 23:12:24.420881583 +0100
-+++ b/CMakeLists.txt	2015-02-23 23:17:07.173858317 +0100
-@@ -18,7 +18,17 @@
- include(ECMAddTests)
- 
- 
--find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick)
-+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport Svg Qml Quick)
-+
-+find_package(Qt5Test CONFIG QUIET)
-+set_package_properties(Qt5Test PROPERTIES
-+    PURPOSE "Required for tests"
-+    TYPE OPTIONAL)
-+add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
-+if (NOT Qt5Test_FOUND)
-+    set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
-+endif()
-+
- find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
- if (NOT Qt5TextToSpeech_FOUND)
-     message(STATUS "Qt5TextToSpeech not found, speech features will be disabled")

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index e898d1c..24767e2 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
 EGIT_BRANCH="frameworks"
 inherit kde5
 
@@ -59,13 +60,6 @@ RDEPEND="${DEPEND}
 RESTRICT=test
 # test 2: parttest hangs
 
-src_prepare() {
-	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-5.9999-tests-optional.patch"
-
-	kde5_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package chm CHM)