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 A5C2715800F for ; Sun, 15 Jan 2023 12:30:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C36E9E0876; Sun, 15 Jan 2023 12:30:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 8CBA6E0876 for ; Sun, 15 Jan 2023 12:30:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BBC67340F0E for ; Sun, 15 Jan 2023 12:30:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD94185B for ; Sun, 15 Jan 2023 12:30:51 +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: <1673785547.f671b2c07dc76f978f3aa257c880db6c5195bdb4.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/plasma/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/plasma/plasma-5.9999.ebuild X-VCS-Directories: kde-frameworks/plasma/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f671b2c07dc76f978f3aa257c880db6c5195bdb4 X-VCS-Branch: master Date: Sun, 15 Jan 2023 12:30:51 +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: b1db78c6-8ee2-4174-adfa-135ecad4de59 X-Archives-Hash: b1e42083bb10a5a1fb817e64a8295f74 commit: f671b2c07dc76f978f3aa257c880db6c5195bdb4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 15 12:22:34 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 15 12:25:47 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f671b2c0 kde-frameworks/plasma: Drop IUSE X kde-frameworks/kwindowsystem[X] is unconditional through use of KX11Extras Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/plasma/plasma-5.9999.ebuild | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/kde-frameworks/plasma/plasma-5.9999.ebuild b/kde-frameworks/plasma/plasma-5.9999.ebuild index ffa9a68d44..ec68e63f85 100644 --- a/kde-frameworks/plasma/plasma-5.9999.ebuild +++ b/kde-frameworks/plasma/plasma-5.9999.ebuild @@ -13,18 +13,20 @@ DESCRIPTION="Plasma framework" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="gles2-only man wayland X" +IUSE="gles2-only man wayland" RESTRICT="test" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=] + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X] >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 =kde-frameworks/kactivities-${PVCUT}*:5 =kde-frameworks/karchive-${PVCUT}*:5 =kde-frameworks/kconfig-${PVCUT}*:5[qml] @@ -41,21 +43,18 @@ RDEPEND=" =kde-frameworks/kpackage-${PVCUT}*:5 =kde-frameworks/kservice-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] =kde-frameworks/kxmlgui-${PVCUT}*:5 - !gles2-only? ( media-libs/libglvnd[X?] ) + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) wayland? ( =kde-frameworks/kwayland-${PVCUT}*:5 media-libs/libglvnd ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libxcb - ) " DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) + x11-base/xorg-proto " BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" @@ -65,7 +64,6 @@ src_configure() { $(cmake_use_find_package man KF5DocTools) $(cmake_use_find_package wayland EGL) $(cmake_use_find_package wayland KF5Wayland) - -DWITHOUT_X11=$(usex !X) ) ecm_src_configure