[gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/

[Johannes Huber]

commit:     e184e882cf22f3a8eb4640f1decdeab312f51789
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 17:29:16 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 17:29:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e184e882

[kde-frameworks/kio] Drop failing patch

Use KDE_PUNT_BOGUS_DEPS magic instead.

Package-Manager: portage-2.2.20

 kde-frameworks/kio/files/kio-tests-optional.patch | 28 -----------------------
 kde-frameworks/kio/kio-9999.ebuild                |  8 +------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/kde-frameworks/kio/files/kio-tests-optional.patch b/kde-frameworks/kio/files/kio-tests-optional.patch
deleted file mode 100644
index ca45d88..0000000
--- a/kde-frameworks/kio/files/kio-tests-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt	2015-01-21 01:30:56.784894492 +0100
-+++ b/CMakeLists.txt	2015-01-21 01:34:51.192505604 +0100
-@@ -57,7 +57,7 @@
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- 
- set(REQUIRED_QT_VERSION 5.2.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml Test)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml)
- 
- find_package(GSSAPI)
- set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of certain HTTP authentication services"
-@@ -85,10 +85,13 @@
- endif()
- include(CheckLibraryExists)
- add_subdirectory(src)
--add_subdirectory(autotests)
- 
--if (NOT KIOCORE_ONLY)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+    find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
-+    add_subdirectory(autotests)
-+    if (NOT KIOCORE_ONLY)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- # create a Config.cmake and a ConfigVersion.cmake file and install them

diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index f471eb1..af3e18b 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 VIRTUALX_REQUIRED="test"
+KDE_PUNT_BOGUS_DEPS=true
 inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
@@ -65,13 +66,6 @@ PDEPEND="
 # tests hang
 RESTRICT="test"
 
-src_prepare() {
-	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-tests-optional.patch"
-
-	kde5_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package acl)