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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 982BB158094 for ; Fri, 5 Aug 2022 15:23:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB6A1E0E5E; Fri, 5 Aug 2022 15:23:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1CA7E0E5E for ; Fri, 5 Aug 2022 15:23:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E897B341100 for ; Fri, 5 Aug 2022 15:23:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8C96568 for ; Fri, 5 Aug 2022 15:23:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1659712655.2ee2fcd4364fe822f000239b32a5d1490600581f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kglobalaccel/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild kde-frameworks/kglobalaccel/metadata.xml X-VCS-Directories: kde-frameworks/kglobalaccel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2ee2fcd4364fe822f000239b32a5d1490600581f X-VCS-Branch: master Date: Fri, 5 Aug 2022 15:23:10 +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: 4c71e39b-73be-4766-be4d-3bb60d2c5963 X-Archives-Hash: 2830119414624718657a3bda31ce4e6f commit: 2ee2fcd4364fe822f000239b32a5d1490600581f Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 5 10:18:50 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 5 15:17:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee2fcd4 kde-frameworks/kglobalaccel: Add back IUSE X Upstream commit 7d6ef389defbcf8fc25762ce772315221a721790 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=426199 Bug: https://bugs.gentoo.org/540120 Signed-off-by: Andreas Sturmlechner gentoo.org> ...5.96.0.ebuild => kglobalaccel-5.96.0-r1.ebuild} | 29 ++++++++++++++-------- kde-frameworks/kglobalaccel/metadata.xml | 3 +++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild similarity index 62% rename from kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild rename to kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild index 7d152d089bbb..b325e1626d1f 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0-r1.ebuild @@ -12,23 +12,25 @@ DESCRIPTION="Framework to handle global shortcuts" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="nls" +IUSE="nls X" -# requires installed instance -RESTRICT="test" +REQUIRED_USE="test? ( X )" +RESTRICT="test" # requires installed instance RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] - x11-libs/libxcb - x11-libs/xcb-util-keysyms + X? ( + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) " DEPEND="${RDEPEND} test? ( @@ -39,6 +41,13 @@ DEPEND="${RDEPEND} " BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" +src_configure() { + local mycmakeargs=( + -DBUILD_RUNTIME=$(usex X) + ) + ecm_src_configure +} + src_test() { XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342 } diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml index 506ecf605bc4..39e72e4520b0 100644 --- a/kde-frameworks/kglobalaccel/metadata.xml +++ b/kde-frameworks/kglobalaccel/metadata.xml @@ -13,4 +13,7 @@ Must only be used by packages that are known to use private parts of the Frameworks API. + + Build the kglobalacceld runtime needed for X +