commit:     05e41d8378d5c04da73ba3d21a2fd94df70b0028
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 17 00:38:45 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 14:34:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=05e41d83

kde-apps/artikulate: Frameworks merged to master

Package-Manager: portage-2.2.20.1

 kde-apps/artikulate/artikulate-5.9999.ebuild | 36 ----------------------------
 kde-apps/artikulate/artikulate-9999.ebuild   | 24 ++++++++++++++-----
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/kde-apps/artikulate/artikulate-5.9999.ebuild 
b/kde-apps/artikulate/artikulate-5.9999.ebuild
deleted file mode 100644
index 17d4d78..0000000
--- a/kde-apps/artikulate/artikulate-5.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=true
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Language learning application that helps improving pronunciation 
skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate";
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtsql:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
-       dev-qt/qtxmlpatterns:5
-       >=media-libs/qt-gstreamer-1.2.0[qt5]
-"
-RDEPEND="${DEPEND}
-       $(add_kdeapps_dep kqtquickcharts)
-"

diff --git a/kde-apps/artikulate/artikulate-9999.ebuild 
b/kde-apps/artikulate/artikulate-9999.ebuild
index 29688a4..847623e 100644
--- a/kde-apps/artikulate/artikulate-9999.ebuild
+++ b/kde-apps/artikulate/artikulate-9999.ebuild
@@ -4,18 +4,30 @@
 
 EAPI=5
 
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+QT_MINIMAL="5.5.0"
+inherit kde5
 
 DESCRIPTION="Language learning application that helps improving pronunciation 
skills"
 HOMEPAGE="https://edu.kde.org/applications/language/artikulate";
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 DEPEND="
-       dev-qt/qtxmlpatterns:4
-       >=media-libs/qt-gstreamer-1.2.0[qt4(+)]
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kdeclarative)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep knewstuff)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kxmlgui)
+       dev-qt/qtdeclarative:5
+       dev-qt/qtgui:5
+       dev-qt/qtsql:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
+       dev-qt/qtxmlpatterns:5
+       >=media-libs/qt-gstreamer-1.2.0[qt5]
 "
 RDEPEND="${DEPEND}
        $(add_kdeapps_dep kqtquickcharts)

Reply via email to