From a72d650cf5317dad3bd41cdaf735a5b18efcedd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Mon, 13 Feb 2023 08:47:31 +0100 Subject: [PATCH] app-editors/emacs: Migrate from net-libs/webkit-gtk:4 to :4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update live ebuild for master (slot 30-vcs). Closes: https://bugs.gentoo.org/893670 Signed-off-by: Ulrich Müller --- app-editors/emacs/emacs-30.0.9999.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index bd609dacece48..3f3d424ca125f 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -67,7 +67,8 @@ X_DEPEND="x11-libs/libICE gtk? ( x11-libs/gtk+:3 xwidgets? ( - net-libs/webkit-gtk:4= + || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 ) + net-libs/webkit-gtk:= x11-libs/libXcomposite ) ) @@ -137,7 +138,10 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4= ) + xwidgets? ( + || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 ) + net-libs/webkit-gtk:= + ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} )