commit: d5a1410083864da8d2478d65f90e6641ea090290 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Tue Feb 24 23:16:47 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Tue Feb 24 23:16:47 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d5a14100
[kde-apps/kpat] Frameworks merged to master Package-Manager: portage-2.2.17 --- kde-apps/kpat/kpat-5.9999.ebuild | 52 ---------------------------------------- kde-apps/kpat/kpat-9999.ebuild | 43 +++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 56 deletions(-) diff --git a/kde-apps/kpat/kpat-5.9999.ebuild b/kde-apps/kpat/kpat-5.9999.ebuild deleted file mode 100644 index bb7af57..0000000 --- a/kde-apps/kpat/kpat-5.9999.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -EGIT_BRANCH="frameworks" -KDE_HANDBOOK="true" -KDE_SELINUX_MODULE="games" -inherit kde5 - -DESCRIPTION="KDE patience game" -HOMEPAGE="http://games.kde.org/game.php?game=kpat"; -KEYWORDS="" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep libkdegames) - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/phonon[qt5] - x11-misc/shared-mime-info -" - -RDEPEND="${DEPEND}" - -src_prepare() { - # fix copy-paste (?) error, there are no tests - sed -i "/find_package(Qt5/ s/ Test//" CMakeLists.txt || die - - kde5_src_prepare -} diff --git a/kde-apps/kpat/kpat-9999.ebuild b/kde-apps/kpat/kpat-9999.ebuild index caa0af7..32d72ab 100644 --- a/kde-apps/kpat/kpat-9999.ebuild +++ b/kde-apps/kpat/kpat-9999.ebuild @@ -4,14 +4,49 @@ EAPI=5 -KDE_HANDBOOK="optional" +KDE_HANDBOOK="true" KDE_SELINUX_MODULE="games" -inherit kde4-base +inherit kde5 DESCRIPTION="KDE patience game" HOMEPAGE="http://games.kde.org/game.php?game=kpat"; KEYWORDS="" -IUSE="debug" +IUSE="" + +# Dependencies needs upstream cleanup +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_kdeapps_dep libkdegames) + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/phonon[qt5] + x11-misc/shared-mime-info +" -DEPEND="$(add_kdeapps_dep libkdegames)" RDEPEND="${DEPEND}" + +src_prepare() { + # fix copy-paste (?) error, there are no tests + sed -i "/find_package(Qt5/ s/ Test//" CMakeLists.txt || die + + kde5_src_prepare +}
