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 026AE1389E2 for ; Thu, 4 Dec 2014 06:56:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BFC6E0835; Thu, 4 Dec 2014 06:56:28 +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 3785DE0835 for ; Thu, 4 Dec 2014 06:56:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECE653405DC for ; Thu, 4 Dec 2014 06:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0C127572 for ; Thu, 4 Dec 2014 06:56:24 +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: <1417676187.f54d62fc427faaba49860148cdf59bb41359a460.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/parley/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/parley/parley-14.11.97.ebuild kde-apps/parley/parley-9999.ebuild X-VCS-Directories: kde-apps/parley/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: f54d62fc427faaba49860148cdf59bb41359a460 X-VCS-Branch: master Date: Thu, 4 Dec 2014 06:56:24 +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: ac4fe548-abcd-49a8-ba57-8980e9760c41 X-Archives-Hash: 6301b1771ef8a014ac5b23bdd8349474 commit: f54d62fc427faaba49860148cdf59bb41359a460 Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 4 06:56:27 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 4 06:56:27 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f54d62fc [kde-apps/parley] Complete previous half-finished KF5 migration. Package-Manager: portage-2.2.14 --- kde-apps/parley/parley-14.11.97.ebuild | 32 +++++++++++++++++++++-- kde-apps/parley/parley-9999.ebuild | 48 ++++++++++++++++++++++------------ 2 files changed, 62 insertions(+), 18 deletions(-) diff --git a/kde-apps/parley/parley-14.11.97.ebuild b/kde-apps/parley/parley-14.11.97.ebuild index 11a8649..e919c67 100644 --- a/kde-apps/parley/parley-14.11.97.ebuild +++ b/kde-apps/parley/parley-14.11.97.ebuild @@ -11,15 +11,43 @@ DESCRIPTION="KDE Educational: vocabulary trainer" HOMEPAGE="http://www.kde.org/applications/education/parley http://edu.kde.org/applications/school/parley" KEYWORDS=" ~amd64 ~x86" -IUSE="+plasma" +IUSE="" DEPEND=" $(add_kdeapps_dep libkeduvocdocument) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kross) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + dev-libs/libxml2:2 + dev-libs/libxslt + dev-qt/qtdbus:5 dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 - $(add_kdeapps_dep libkdeedu) + dev-qt/qtwidgets:5 " RDEPEND="${DEPEND} + $(add_kdeapps_dep kdeedu-data) !kde-base/parley:4 " + +src_install() { + kde5_src_install + + rm "${D}"/usr/share/icons/oxygen/*/actions/edit-clear.png +} diff --git a/kde-apps/parley/parley-9999.ebuild b/kde-apps/parley/parley-9999.ebuild index 17242fd..5cb5729 100644 --- a/kde-apps/parley/parley-9999.ebuild +++ b/kde-apps/parley/parley-9999.ebuild @@ -4,28 +4,44 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="true" +inherit kde5 DESCRIPTION="KDE Educational: vocabulary trainer" HOMEPAGE="http://www.kde.org/applications/education/parley http://edu.kde.org/applications/school/parley" KEYWORDS="" -IUSE="debug +plasma" +IUSE="" DEPEND=" - $(add_kdeapps_dep libkdeedu) + $(add_kdeapps_dep libkeduvocdocument) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kross) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + dev-libs/libxml2:2 + dev-libs/libxslt + dev-qt/qtdbus:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 " -RDEPEND="${DEPEND}" - -KMEXTRACTONLY=" - libkdeedu/keduvocdocument +RDEPEND="${DEPEND} + $(add_kdeapps_dep kdeedu-data) + !kde-base/parley:4 " - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with plasma) - ) - - kde4-base_src_configure -}