commit: ebd6fd0838027140424cc536ea08fbdc3af9f934 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Tue Nov 1 21:26:37 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Tue Nov 1 21:26:37 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ebd6fd08
kde-apps/ktouch: Frameworks merged to master Package-Manager: portage-2.3.2 kde-apps/ktouch/ktouch-5.9999.ebuild | 40 ------------------------------------ kde-apps/ktouch/ktouch-9999.ebuild | 32 +++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 46 deletions(-) diff --git a/kde-apps/ktouch/ktouch-5.9999.ebuild b/kde-apps/ktouch/ktouch-5.9999.ebuild deleted file mode 100644 index 3373f67..0000000 --- a/kde-apps/ktouch/ktouch-5.9999.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="Program that helps to learn and practice touch typing" -HOMEPAGE="https://www.kde.org/applications/education/ktouch/" -KEYWORDS="" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) - x11-libs/libX11 -" -RDEPEND="${DEPEND} - $(add_kdeapps_dep kqtquickcharts) -" diff --git a/kde-apps/ktouch/ktouch-9999.ebuild b/kde-apps/ktouch/ktouch-9999.ebuild index f6aa77c..e5c94be 100644 --- a/kde-apps/ktouch/ktouch-9999.ebuild +++ b/kde-apps/ktouch/ktouch-9999.ebuild @@ -4,16 +4,36 @@ EAPI=6 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="forceoptional" +inherit kde5 DESCRIPTION="Program that helps to learn and practice touch typing" HOMEPAGE="https://www.kde.org/applications/education/ktouch/" KEYWORDS="" -IUSE="debug" +IUSE="" -RDEPEND=" - $(add_kdeapps_dep knotify) +DEPEND=" + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtsql) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) + x11-libs/libX11 +" +RDEPEND="${DEPEND} $(add_kdeapps_dep kqtquickcharts) - $(add_kdeapps_dep plasma-runtime) "