commit: 82a0d03dbd51f1fc514b906f7359f8bae29f9530
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Mar 9 22:36:55 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 23:04:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=82a0d03d
[kde-apps/libkcddb] Tests optional patch upstreamed
Block by eclass
Package-Manager: portage-2.2.18
.../files/libkcddb-5.9999-tests-optional.patch | 27 ----------------------
kde-apps/libkcddb/libkcddb-5.9999.ebuild | 6 +----
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/kde-apps/libkcddb/files/libkcddb-5.9999-tests-optional.patch
b/kde-apps/libkcddb/files/libkcddb-5.9999-tests-optional.patch
deleted file mode 100644
index 22ddd41..0000000
--- a/kde-apps/libkcddb/files/libkcddb-5.9999-tests-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CMakeLists.txt 2015-01-20 00:43:05.096398998 +0100
-+++ b/CMakeLists.txt 2015-01-20 00:44:37.340010389 +0100
-@@ -12,7 +12,7 @@
- include(GenerateExportHeader)
- include(ECMSetupVersion)
-
--find_package(Qt5 REQUIRED COMPONENTS Network Widgets Test)
-+find_package(Qt5 REQUIRED COMPONENTS Network Widgets)
- find_package(KF5 REQUIRED COMPONENTS Config DocTools Codecs I18n KIO
WidgetsAddons)
-
- ecm_setup_version(${KF5_VERSION}
-@@ -36,10 +36,14 @@
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
--add_subdirectory( test )
- add_subdirectory( kcmcddb )
- add_subdirectory( libkcddb )
-
-+if(BUILD_TESTING)
-+ find_package(Qt5Test REQUIRED)
-+ add_subdirectory( test )
-+endif()
-+
- feature_summary(WHAT PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
- # Figure out the relative path from the installed Config.cmake file to the
install prefix (which may be at
diff --git a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
index 3293d1a..f753343 100644
--- a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
@@ -29,11 +29,7 @@ DEPEND="
dev-qt/qtwidgets:5
musicbrainz? ( media-libs/musicbrainz:5 )
"
-RDEPEND="${DEPEND}
- !kde-base/libkcddb:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.9999-tests-optional.patch" )
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
