From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 19930138BED for ; Sat, 17 Oct 2015 14:34:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1668721C005; Sat, 17 Oct 2015 14:34:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91E1B21C005 for ; Sat, 17 Oct 2015 14:34:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F6D63408AC for ; Sat, 17 Oct 2015 14:34:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CD441192 for ; Sat, 17 Oct 2015 14:34:37 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1445092467.05e41d8378d5c04da73ba3d21a2fd94df70b0028.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/artikulate/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/artikulate/artikulate-5.9999.ebuild kde-apps/artikulate/artikulate-9999.ebuild X-VCS-Directories: kde-apps/artikulate/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 05e41d8378d5c04da73ba3d21a2fd94df70b0028 X-VCS-Branch: master Date: Sat, 17 Oct 2015 14:34:37 +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: 45de6321-bf14-443f-acfa-dd721b09e92c X-Archives-Hash: 65a7140601114889861d3b9a2c078665 commit: 05e41d8378d5c04da73ba3d21a2fd94df70b0028 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Oct 17 00:38:45 2015 +0000 Commit: Michael Palimaka gentoo 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)