summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-10-17 02:38:45 +0200
committerMichael Palimaka <kensington@gentoo.org>2015-10-18 01:34:27 +1100
commit05e41d8378d5c04da73ba3d21a2fd94df70b0028 (patch)
tree76e62fef91506a553fbd84c5d43b99a8f7db3604
parent860ee4855134a6a2b4c1adfc9ba9ebbcd81577f3 (diff)
downloadkde-05e41d8378d5c04da73ba3d21a2fd94df70b0028.tar.gz
kde-05e41d8378d5c04da73ba3d21a2fd94df70b0028.tar.bz2
kde-05e41d8378d5c04da73ba3d21a2fd94df70b0028.zip
kde-apps/artikulate: Frameworks merged to master
Package-Manager: portage-2.2.20.1
-rw-r--r--kde-apps/artikulate/artikulate-5.9999.ebuild36
-rw-r--r--kde-apps/artikulate/artikulate-9999.ebuild24
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 17d4d78b926..00000000000
--- 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 29688a4494e..847623e3cbe 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)