commit: 70de04485f0acd21563dd14f73905344997bab53
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Dec 1 14:36:34 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 09:49:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=70de0448
kde-apps/libkdegames: Doxygen, Fix DEPEND, patch -> KDE_TEST=forceoptional
Package-Manager: portage-2.2.26
.../files/libkdegames-tests-optional.patch | 33 ----------------------
.../libkdegames/libkdegames-15.12.49.9999.ebuild | 4 ++-
kde-apps/libkdegames/libkdegames-9999.ebuild | 4 ++-
3 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
b/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
deleted file mode 100644
index 0b019c1..0000000
--- a/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2664fd4..32f453b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,3 @@
--enable_testing()
--
- project(libkdegames)
-
- cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-@@ -9,12 +7,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
-
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml
Quick QuickWidgets Svg Test)
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml
Quick QuickWidgets Svg)
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs
Archive
- DBusAddons DNSSD Declarative
- I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion
JobWidgets TextWidgets GlobalAccel XmlGui Crash
- Bookmarks KIO NewStuff)
-
-+find_package(Qt5Test ${QT_MIN_VERSION} 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()
-+
- include(FeatureSummary)
- include(GenerateExportHeader)
- include(ECMPackageConfigHelpers)
diff --git a/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
b/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
index 01869df..dbe7fbc 100644
--- a/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
@@ -5,7 +5,8 @@
EAPI=5
KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
+KDE_DOXYGEN="true"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -42,6 +43,7 @@ DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
dev-qt/qtsvg:5
+ dev-qt/qtxml:5
media-libs/libsndfile
media-libs/openal
"
diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild
b/kde-apps/libkdegames/libkdegames-9999.ebuild
index 01869df..dbe7fbc 100644
--- a/kde-apps/libkdegames/libkdegames-9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-9999.ebuild
@@ -5,7 +5,8 @@
EAPI=5
KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
+KDE_DOXYGEN="true"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -42,6 +43,7 @@ DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
dev-qt/qtsvg:5
+ dev-qt/qtxml:5
media-libs/libsndfile
media-libs/openal
"
