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 0B3DE1395E2 for ; Tue, 1 Nov 2016 21:26:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37F8EE0C24; Tue, 1 Nov 2016 21:26:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 121E7E0C24 for ; Tue, 1 Nov 2016 21:26:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E45743413F6 for ; Tue, 1 Nov 2016 21:26:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9440C7E1 for ; Tue, 1 Nov 2016 21:26:47 +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: <1478035597.ebd6fd0838027140424cc536ea08fbdc3af9f934.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ktouch/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/ktouch/ktouch-5.9999.ebuild kde-apps/ktouch/ktouch-9999.ebuild X-VCS-Directories: kde-apps/ktouch/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: ebd6fd0838027140424cc536ea08fbdc3af9f934 X-VCS-Branch: master Date: Tue, 1 Nov 2016 21:26:47 +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: e66a6a10-5787-42eb-8db2-4603fa4b5bf7 X-Archives-Hash: ef220f2ad988cf9b51f23ca464b3a667 commit: ebd6fd0838027140424cc536ea08fbdc3af9f934 Author: Johannes Huber gentoo org> AuthorDate: Tue Nov 1 21:26:37 2016 +0000 Commit: Johannes Huber gentoo 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) "