commit:     448c682b054e4ba1f320667e24553f9cc1ceb079
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 11:05:17 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 31 12:53:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=448c682b

kde-plasma/kwin: RDEPEND-block >=media-libs/libglvnd-1.3.4

At the same time, DEPEND on <media-libs/libglvnd-1.3.4 to help
Portage with dependency resolution, even if this is not a direct
dependency of KWin.

Bug: https://bugs.gentoo.org/810511
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwin/kwin-5.22.49.9999.ebuild | 3 +++
 kde-plasma/kwin/kwin-9999.ebuild         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/kde-plasma/kwin/kwin-5.22.49.9999.ebuild 
b/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
index 3c083c2889..f2c44e3e91 100644
--- a/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.49.9999.ebuild
@@ -79,6 +79,7 @@ COMMON_DEPEND="
 "
 # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
 RDEPEND="${COMMON_DEPEND}
+       !>=media-libs/libglvnd-1.3.4
        >=dev-qt/qtquickcontrols-${QTMIN}:5
        >=dev-qt/qtquickcontrols2-${QTMIN}:5
        >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
@@ -90,9 +91,11 @@ RDEPEND="${COMMON_DEPEND}
        )
        multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
+# FIXME: <media-libs/libglvnd-1.3.4 not a dep, only temp. workaround for bug 
#810511
 DEPEND="${COMMON_DEPEND}
        >=dev-qt/designer-${QTMIN}:5
        >=dev-qt/qtconcurrent-${QTMIN}:5
+       <media-libs/libglvnd-1.3.4
        x11-base/xorg-proto
        test? (
                >=dev-libs/wayland-protocols-1.19

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 9aa0cd7f82..c897dbd9e6 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -78,6 +78,7 @@ COMMON_DEPEND="
 "
 # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
 RDEPEND="${COMMON_DEPEND}
+       !>=media-libs/libglvnd-1.3.4
        >=dev-qt/qtquickcontrols-${QTMIN}:5
        >=dev-qt/qtquickcontrols2-${QTMIN}:5
        >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
@@ -89,9 +90,11 @@ RDEPEND="${COMMON_DEPEND}
        )
        multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
+# FIXME: <media-libs/libglvnd-1.3.4 not a dep, only temp. workaround for bug 
#810511
 DEPEND="${COMMON_DEPEND}
        >=dev-qt/designer-${QTMIN}:5
        >=dev-qt/qtconcurrent-${QTMIN}:5
+       <media-libs/libglvnd-1.3.4
        x11-base/xorg-proto
        test? (
                >=dev-libs/wayland-protocols-1.19

Reply via email to