summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-02-15 21:41:59 +0100
committerJohannes Huber <johu@gentoo.org>2015-02-15 22:43:50 +0100
commit3e5d99a85e99eb337e9168c5743e2e07a3365b5e (patch)
tree9f33899685f45a1834990615177f401a195ff7ba
parent8d714b12c5f9e6be8d2a526eb6e91c2e9d7f69e5 (diff)
downloadkde-3e5d99a85e99eb337e9168c5743e2e07a3365b5e.tar.gz
kde-3e5d99a85e99eb337e9168c5743e2e07a3365b5e.tar.bz2
kde-3e5d99a85e99eb337e9168c5743e2e07a3365b5e.zip
[kde-apps/knetwalk] Frameworks merged to master
Package-Manager: portage-2.2.14
-rw-r--r--kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch27
-rw-r--r--kde-apps/knetwalk/knetwalk-9999.ebuild31
-rw-r--r--sets/kdegames-live1
3 files changed, 54 insertions, 5 deletions
diff --git a/kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch b/kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch
new file mode 100644
index 00000000000..4a0712e5963
--- /dev/null
+++ b/kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt 2015-02-15 21:59:57.932461024 +0100
++++ b/CMakeLists.txt 2015-02-15 22:06:56.974222282 +0100
+@@ -4,7 +4,7 @@
+ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${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
+@@ -21,6 +21,15 @@
+ )
+ find_package(KF5KDEGames 4.9.0 REQUIRED)
+
++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(ECMInstallIcons)
+ include(KDEInstallDirs)
diff --git a/kde-apps/knetwalk/knetwalk-9999.ebuild b/kde-apps/knetwalk/knetwalk-9999.ebuild
index 1ab29131a3a..ec87fd2bb42 100644
--- a/kde-apps/knetwalk/knetwalk-9999.ebuild
+++ b/kde-apps/knetwalk/knetwalk-9999.ebuild
@@ -4,16 +4,37 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
-DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
+DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
HOMEPAGE="
http://www.kde.org/applications/games/knetwalk/
http://games.kde.org/game.php?game=knetwalk
"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
-DEPEND="$(add_kdeapps_dep libkdegames)"
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep libkdegames)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
diff --git a/sets/kdegames-live b/sets/kdegames-live
index 23b23219193..09badaae2f0 100644
--- a/sets/kdegames-live
+++ b/sets/kdegames-live
@@ -8,6 +8,7 @@
~kde-apps/kdiamond-9999
~kde-apps/klines-9999
~kde-apps/kmines-9999
+~kde-apps/knetwalk-9999
~kde-apps/kshisen-9999
~kde-apps/libkdegames-9999
~kde-apps/libkmahjongg-9999