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 EA14258974 for ; Tue, 26 Jan 2016 18:19:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92D9121C004; Tue, 26 Jan 2016 18:19:00 +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 C8C01E0888 for ; Tue, 26 Jan 2016 18:18:59 +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 D01E8340B98 for ; Tue, 26 Jan 2016 18:18:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55DE410FC for ; Tue, 26 Jan 2016 18:18:55 +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: <1453832318.8f64eed90b14a4223bc53c1507543d294921e503.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-im/choqok/ X-VCS-Repository: proj/kde X-VCS-Files: net-im/choqok/choqok-9999.ebuild net-im/choqok/metadata.xml X-VCS-Directories: net-im/choqok/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 8f64eed90b14a4223bc53c1507543d294921e503 X-VCS-Branch: master Date: Tue, 26 Jan 2016 18:18:55 +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: 878f8830-97a7-4574-a525-a65e2bbc664a X-Archives-Hash: 697c6c49cdb93a55bec8b7754f5ce33d commit: 8f64eed90b14a4223bc53c1507543d294921e503 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jan 24 01:36:51 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Jan 26 18:18:38 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f64eed9 net-im/choqok: Frameworks merged to master, bug 550694 Package-Manager: portage-2.2.26 net-im/choqok/choqok-9999.ebuild | 68 ++++++++++++++++++++++++++-------------- net-im/choqok/metadata.xml | 3 +- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild index a32d5d6..632a682 100644 --- a/net-im/choqok/choqok-9999.ebuild +++ b/net-im/choqok/choqok-9999.ebuild @@ -4,42 +4,64 @@ EAPI=5 -KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl -hr hu is it ja km lt mr ms nb nds nl pa pl pt pt_BR ro ru sk sq sl sv tr ug -uk zh_CN zh_TW" -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_GCC_MINIMAL="4.9" +KDE_HANDBOOK="forceoptional" +QT_MINIMAL="5.5.1" +inherit kde5 DESCRIPTION="Free/Open Source micro-blogging client for KDE" HOMEPAGE="http://choqok.gnufolks.org/" -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc ~x86" -else - KEYWORDS="" -fi - LICENSE="GPL-2+" -SLOT="4" -IUSE="ayatana debug" +IUSE="attica konqueror" -RDEPEND=" - dev-libs/libattica +DEPEND=" + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + app-crypt/qca[qt5] dev-libs/qjson - >=dev-libs/qoauth-1.0.1 - ayatana? ( dev-libs/libindicate-qt ) + dev-libs/qoauth:5 + dev-qt/qtconcurrent:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + net-libs/telepathy-qt[qt5] + attica? ( dev-libs/libattica ) + konqueror? ( + $(add_frameworks_dep kparts) + $(add_frameworks_dep kdewebkit) + ) " -DEPEND="${RDEPEND} - app-arch/xz-utils +RDEPEND="${DEPEND} + !net-im/choqok:4 " DOCS=( AUTHORS README TODO changelog ) -src_prepare(){ +src_configure() { local mycmakeargs=( - $(cmake-utils_use !ayatana QTINDICATE_DISABLE) + $(cmake-utils_use_find_package attica KF5Attica) + $(cmake-utils_use_find_package konqueror KF5Parts) + $(cmake-utils_use_find_package konqueror KF5WebKit) ) - kde4-base_src_prepare + kde5_src_configure } diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml index f0a0113..fdeebea 100644 --- a/net-im/choqok/metadata.xml +++ b/net-im/choqok/metadata.xml @@ -6,6 +6,7 @@ Gentoo KDE Project - Build in support for Ayatana notification using the libindicate-qt plugin. + Build Open Collaboration Services plugin using dev-libs/libattica + Build Konqueror Choqok plugin