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 A89A713835A for ; Fri, 2 Oct 2020 17:45:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D483E09E2; Fri, 2 Oct 2020 17:45:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 87DF9E09E2 for ; Fri, 2 Oct 2020 17:45:37 +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 8B95F340CA2 for ; Fri, 2 Oct 2020 17:45:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3598C38D for ; Fri, 2 Oct 2020 17:45:35 +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: <1601660709.467eca20025720901b9ee2aa074feb4958c0ba03.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.5.ebuild app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild X-VCS-Directories: app-i18n/kcm-fcitx/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 467eca20025720901b9ee2aa074feb4958c0ba03 X-VCS-Branch: master Date: Fri, 2 Oct 2020 17:45:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 628b01d8-7a4b-4b2c-8313-a2972298cbd7 X-Archives-Hash: 724a339b6e19cc18a57b07c6bc706725 commit: 467eca20025720901b9ee2aa074feb4958c0ba03 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Sep 26 03:00:00 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Oct 2 17:45:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467eca20 app-i18n/kcm-fcitx: Use EAPI="7". moc (dev-qt/qtcore:5) called by build system. uic (dev-qt/qtwidgets:5) called by build system. Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild | 19 +++++++++++-------- app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild index 7204e2277fe..c8f903b0e90 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit cmake-utils @@ -24,7 +24,13 @@ SLOT="4-plasma5" KEYWORDS="amd64 x86" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -40,12 +46,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 - x11-libs/libxkbfile - !${CATEGORY}/${PN}:4[-minimal(-)]" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - sys-devel/gettext - virtual/pkgconfig" + x11-libs/libxkbfile" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" src_configure() { local mycmakeargs=( diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild index bed2c38530a..5edbbf830dd 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit cmake-utils @@ -24,7 +24,13 @@ SLOT="4-plasma5" KEYWORDS="" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -40,12 +46,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 - x11-libs/libxkbfile - !${CATEGORY}/${PN}:4[-minimal(-)]" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - sys-devel/gettext - virtual/pkgconfig" + x11-libs/libxkbfile" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" src_configure() { local mycmakeargs=(