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 EA2D0138A1A for ; Mon, 19 Jan 2015 19:13:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 303B7E099F; Mon, 19 Jan 2015 19:13:20 +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 A685AE099F for ; Mon, 19 Jan 2015 19:13:19 +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 ADEE73406BA for ; Mon, 19 Jan 2015 19:13:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CB1BFEE1 for ; Mon, 19 Jan 2015 19:13:17 +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: <1421694753.44f96eb41babf00422248297fa7ac90ed4c71497.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/files/, kde-apps/libkdegames/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch kde-apps/libkdegames/libkdegames-5.9999.ebuild X-VCS-Directories: kde-apps/libkdegames/ kde-apps/libkdegames/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 44f96eb41babf00422248297fa7ac90ed4c71497 X-VCS-Branch: master Date: Mon, 19 Jan 2015 19:13:17 +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: 6f5d568f-26f3-418c-b7fa-eac7954f4190 X-Archives-Hash: 0082407235dac7e58735e95908c392e0 commit: 44f96eb41babf00422248297fa7ac90ed4c71497 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jan 18 12:27:33 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Jan 19 19:12:33 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=44f96eb4 [kde-apps/libkdegames] Add KF5 version --- .../files/libkdegames-5.9999-buildsystem.patch | 58 ++++++++++++++++++++++ kde-apps/libkdegames/libkdegames-5.9999.ebuild | 52 +++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch b/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch new file mode 100644 index 0000000..62a7186 --- /dev/null +++ b/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch @@ -0,0 +1,58 @@ +--- a/CMakeLists.txt 2015-01-18 21:48:57.436568121 +0100 ++++ b/CMakeLists.txt 2015-01-18 21:49:04.667567906 +0100 +@@ -1,5 +1,3 @@ +-enable_testing() +- + project(libkdegames) + + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +@@ -9,7 +7,7 @@ + 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 +@@ -51,7 +49,10 @@ + add_subdirectory( highscore ) + add_subdirectory( includes ) + add_subdirectory( libkdegamesprivate ) +-add_subdirectory( tests ) ++ ++if(BUILD_TESTING) ++ add_subdirectory( tests ) ++endif() + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/highscore +--- a/tests/CMakeLists.txt 2015-01-18 21:34:42.477593601 +0100 ++++ b/tests/CMakeLists.txt 2015-01-18 21:39:09.461585644 +0100 +@@ -1,3 +1,5 @@ ++find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) ++ + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) + include_directories( ${CMAKE_SOURCE_DIR}/libkdegames ) + +--- a/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 ++++ b/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:51:18.496563917 +0100 +@@ -1,7 +1,8 @@ +-enable_testing() + project(libkdegamesprivate) + +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory( tests ) ++endif() + + # NOTE: The libkdegamesprivate target is compiled in the parent directory, + # because CMake can't cope with exported libraries in two different +--- a/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 ++++ b/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:54:04.201558979 +0100 +@@ -1,3 +1,5 @@ ++find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) ++ + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) + diff --git a/kde-apps/libkdegames/libkdegames-5.9999.ebuild b/kde-apps/libkdegames/libkdegames-5.9999.ebuild new file mode 100644 index 0000000..b413dcd --- /dev/null +++ b/kde-apps/libkdegames/libkdegames-5.9999.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +EGIT_BRANCH="frameworks" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Base library common to many KDE games" +KEYWORDS="" +IUSE="" + +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kdnssd) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + media-libs/libsndfile + media-libs/openal +" + +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-5.9999-buildsystem.patch" )