From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7FED1396D0 for ; Thu, 31 Aug 2017 19:53:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49D43E0D49; Thu, 31 Aug 2017 19:53:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B8A7E0D34 for ; Thu, 31 Aug 2017 19:53:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61BF4340BEA for ; Thu, 31 Aug 2017 19:53:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 073DE8969 for ; Thu, 31 Aug 2017 19:53:18 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1504209173.6e43a1e33d68e470c772b09f0489eecf47677de0.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild X-VCS-Directories: app-i18n/kcm-fcitx/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6e43a1e33d68e470c772b09f0489eecf47677de0 X-VCS-Branch: master Date: Thu, 31 Aug 2017 19:53:18 +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: 3ff03d40-d016-4c2a-a1bc-569c4f2b947a X-Archives-Hash: 572434c78bc2a7d3da2a1d7cbb8f12ac commit: 6e43a1e33d68e470c772b09f0489eecf47677de0 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu Aug 31 18:30:01 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Aug 31 19:52:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e43a1e3 app-i18n/kcm-fcitx: Update dependencies. https://github.com/fcitx/kcm-fcitx/commit/f8416ffe5b8baf1f3102fb8fe9d757cc3117bad2 app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild | 8 +++++++- app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild index 59ff589971a..7c1971240e5 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild @@ -30,7 +30,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.8 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - kde-frameworks/kcmutils:5 + kde-frameworks/kcompletion:5 + kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 @@ -48,6 +49,11 @@ src_prepare() { # x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5. sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt + # Adjust dependencies to match actual usage. + # https://github.com/fcitx/kcm-fcitx/issues/12 + sed -e "s/KCMUtils/Completion\n ConfigWidgets/" -i CMakeLists.txt + sed -e "s/KF5::KCMUtils/KF5::Completion\n KF5::ConfigWidgets/" -i src/CMakeLists.txt + cmake-utils_src_prepare } diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild index 7b6425d1af8..d82e5c56359 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild @@ -31,7 +31,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - kde-frameworks/kcmutils:5 + kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5