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 BF049158018 for ; Sun, 3 Oct 2021 09:33:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBDDBE0909; Sun, 3 Oct 2021 09:33:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C310DE0909 for ; Sun, 3 Oct 2021 09:33:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C5C1342C4F for ; Sun, 3 Oct 2021 09:33:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3C3083 for ; Sun, 3 Oct 2021 09:32:58 +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: <1633253571.4e33b214277678efe6e480789afdc7f3a9c9dc31.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/layer-shell-qt/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild X-VCS-Directories: kde-plasma/layer-shell-qt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4e33b214277678efe6e480789afdc7f3a9c9dc31 X-VCS-Branch: master Date: Sun, 3 Oct 2021 09:32:58 +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: 6982338a-cbaa-4eb5-8905-3cc0034ce199 X-Archives-Hash: 805d0f870dfb7cf4de2456d1e78ce9c6 commit: 4e33b214277678efe6e480789afdc7f3a9c9dc31 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 3 09:16:24 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 3 09:32:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e33b214 kde-plasma/layer-shell-qt: Needs dev-qt/qtwayland private headers Add slot operator accordingly. Bug: https://bugs.gentoo.org/815646 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...er-shell-qt-5.22.5.ebuild => layer-shell-qt-5.22.5-r1.ebuild} | 9 +++++++-- kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild similarity index 69% rename from kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild rename to kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild index 04aab13c07c..a83e73a29d8 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild @@ -14,11 +14,16 @@ SLOT="5" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" IUSE="" +# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X +# slot op: various private QtWaylandClient headers RDEPEND=" >=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[X] - >=dev-qt/qtwayland-${QTMIN}:5 + || ( + >=dev-qt/qtgui-${QTMIN}:5[libinput] + >=dev-qt/qtgui-${QTMIN}:5[X] + ) + >=dev-qt/qtwayland-${QTMIN}:5= x11-libs/libxkbcommon " DEPEND="${RDEPEND} diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild index e70d7db79a1..582e24874ff 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild @@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="" # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X +# slot op: various private QtWaylandClient headers RDEPEND=" >=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -22,7 +23,7 @@ RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5[libinput] >=dev-qt/qtgui-${QTMIN}:5[X] ) - >=dev-qt/qtwayland-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5= x11-libs/libxkbcommon " DEPEND="${RDEPEND}