From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7237F139694 for ; Mon, 1 May 2017 18:44:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45BDDE0C7C; Mon, 1 May 2017 18:43:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12652E0C7C for ; Mon, 1 May 2017 18:43:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A504633BEAE for ; Mon, 1 May 2017 18:43:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FD7C7446 for ; Mon, 1 May 2017 18:43:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1493663477.46f6441e19ea6f3c5797c755a42cc0c54b80b7ae.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ksudoku/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/ksudoku/ksudoku-5.9999.ebuild kde-apps/ksudoku/ksudoku-9999.ebuild X-VCS-Directories: kde-apps/ksudoku/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 46f6441e19ea6f3c5797c755a42cc0c54b80b7ae X-VCS-Branch: master Date: Mon, 1 May 2017 18:43:56 +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: 051d73c3-4135-473f-b65a-51d7ea800d8b X-Archives-Hash: 499337952a3a509ac031c828a04df2e0 commit: 46f6441e19ea6f3c5797c755a42cc0c54b80b7ae Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 1 18:31:17 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 1 18:31:17 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=46f6441e kde-apps/ksudoku: Frameworks merged to master Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/ksudoku/ksudoku-5.9999.ebuild | 50 ---------------------------------- kde-apps/ksudoku/ksudoku-9999.ebuild | 36 ++++++++++++++++++------ 2 files changed, 28 insertions(+), 58 deletions(-) diff --git a/kde-apps/ksudoku/ksudoku-5.9999.ebuild b/kde-apps/ksudoku/ksudoku-5.9999.ebuild deleted file mode 100644 index 9ead4a2f6e..0000000000 --- a/kde-apps/ksudoku/ksudoku-5.9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK=true -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="Sudoku by KDE" -HOMEPAGE=" - https://www.kde.org/applications/games/ksudoku/ - https://games.kde.org/game.php?game=ksudoku -" -KEYWORDS="" -IUSE="opengl" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep libkdegames) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - opengl? ( - $(add_qt_dep qtopengl) - virtual/glu - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package opengl OpenGL) - ) - - kde5_src_configure -} diff --git a/kde-apps/ksudoku/ksudoku-9999.ebuild b/kde-apps/ksudoku/ksudoku-9999.ebuild index 0d827e6c92..d95161ea52 100644 --- a/kde-apps/ksudoku/ksudoku-9999.ebuild +++ b/kde-apps/ksudoku/ksudoku-9999.ebuild @@ -3,27 +3,47 @@ EAPI=6 -KDE_HANDBOOK="optional" -OPENGL_REQUIRED="optional" -inherit kde4-base +KDE_HANDBOOK="true" +inherit kde5 -DESCRIPTION="Sudoku by KDE" +DESCRIPTION="Logic-based symbol placement puzzle by KDE" HOMEPAGE=" https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku " KEYWORDS="" -IUSE="debug" +IUSE="opengl" DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep libkdegames) - opengl? ( virtual/glu ) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + opengl? ( + $(add_qt_dep qtopengl) + virtual/glu + ) " RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( - -DWITH_OpenGL=$(usex opengl) + $(cmake-utils_use_find_package opengl OpenGL) ) - kde4-base_src_configure + + kde5_src_configure }