commit: a9edb784d35b35e055f0d26229063edf991c551b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 12:46:38 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 12:47:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9edb784
app-editors/emacs: Allow either of webkit-gtk:4.1 and :4
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/emacs-26.3-r12.ebuild | 3 ++-
app-editors/emacs/emacs-27.2-r10.ebuild | 3 ++-
app-editors/emacs/emacs-28.2-r5.ebuild | 3 ++-
app-editors/emacs/emacs-29.0.9999-r1.ebuild | 8 ++++++--
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app-editors/emacs/emacs-26.3-r12.ebuild
b/app-editors/emacs/emacs-26.3-r12.ebuild
index 29c9491118fb..0b9eb2080e3d 100644
--- a/app-editors/emacs/emacs-26.3-r12.ebuild
+++ b/app-editors/emacs/emacs-26.3-r12.ebuild
@@ -64,7 +64,8 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gtk? (
x11-libs/gtk+:3
xwidgets? (
- net-libs/webkit-gtk:4.1=
+ || ( net-libs/webkit-gtk:4.1
net-libs/webkit-gtk:4 )
+ net-libs/webkit-gtk:=
x11-libs/libXcomposite
)
)
diff --git a/app-editors/emacs/emacs-27.2-r10.ebuild
b/app-editors/emacs/emacs-27.2-r10.ebuild
index be9e4f277203..9071c259fe2c 100644
--- a/app-editors/emacs/emacs-27.2-r10.ebuild
+++ b/app-editors/emacs/emacs-27.2-r10.ebuild
@@ -98,7 +98,8 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gtk? (
x11-libs/gtk+:3
xwidgets? (
- net-libs/webkit-gtk:4.1=
+ || ( net-libs/webkit-gtk:4.1
net-libs/webkit-gtk:4 )
+ net-libs/webkit-gtk:=
x11-libs/libXcomposite
)
)
diff --git a/app-editors/emacs/emacs-28.2-r5.ebuild
b/app-editors/emacs/emacs-28.2-r5.ebuild
index 6ffaf5fe8d0c..14b618129cf0 100644
--- a/app-editors/emacs/emacs-28.2-r5.ebuild
+++ b/app-editors/emacs/emacs-28.2-r5.ebuild
@@ -101,7 +101,8 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gtk? (
x11-libs/gtk+:3
xwidgets? (
- net-libs/webkit-gtk:4.1=
+ || ( net-libs/webkit-gtk:4.1
net-libs/webkit-gtk:4 )
+ net-libs/webkit-gtk:=
x11-libs/libXcomposite
)
)
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index b06274d3a565..4da879104fa7 100644
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -67,7 +67,8 @@ X_DEPEND="x11-libs/libICE
gtk? (
x11-libs/gtk+:3
xwidgets? (
- net-libs/webkit-gtk:4.1=
+ || ( 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.1= )
+ xwidgets? (
+ || ( net-libs/webkit-gtk:4.1
net-libs/webkit-gtk:4 )
+ net-libs/webkit-gtk:=
+ )
) )
!gtk? ( ${X_DEPEND} )
X? ( ${X_DEPEND} )
