From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F08A1395E4 for ; Sat, 1 Aug 2015 17:27:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A23514020; Sat, 1 Aug 2015 17:27:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2810614020 for ; Sat, 1 Aug 2015 17:27:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DBE3340756 for ; Sat, 1 Aug 2015 17:27:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E711B2 for ; Sat, 1 Aug 2015 17:27:19 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1438450156.e184e882cf22f3a8eb4640f1decdeab312f51789.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kio/files/kio-tests-optional.patch kde-frameworks/kio/kio-9999.ebuild X-VCS-Directories: kde-frameworks/kio/ kde-frameworks/kio/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: e184e882cf22f3a8eb4640f1decdeab312f51789 X-VCS-Branch: master Date: Sat, 1 Aug 2015 17:27:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 13ec0125-9bcf-4fe6-bbcf-2bf58e3fc232 X-Archives-Hash: 27ab1ce482406248def34d00c17b971f commit: e184e882cf22f3a8eb4640f1decdeab312f51789 Author: Johannes Huber gentoo org> AuthorDate: Sat Aug 1 17:29:16 2015 +0000 Commit: Johannes Huber gentoo 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)