gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Revert "app-editors/emacs: Allow either of webkit-gtk:4.1 and :4"

Browse Source 
The dependency "|| ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=" does not work, because the last dependency
specification may pull in webkit-gtk:5. Since all slots of webkit-gtk
have the same PV, we cannot restrict the dependency to slots 4 and 4.1
only.

This reverts commit a9edb784d3.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
This commit is contained in:
Ulrich Müller
2023-02-18 16:34:14 +01:00
parent e26eaf1ecb
commit 9efdc11e71
5 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app-editors/emacs/emacs-26.3-r12.ebuild
View File

@@ -64,8 +64,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gtk? (
x11-libs/gtk+:3
xwidgets? (
|| ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
net-libs/webkit-gtk:4.1=
x11-libs/libXcomposite
)
)

3
app-editors/emacs/emacs-27.2-r10.ebuild
View File

@@ -98,8 +98,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gtk? (
x11-libs/gtk+:3
xwidgets? (
|| ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
net-libs/webkit-gtk:4.1=
x11-libs/libXcomposite
)
)

3
app-editors/emacs/emacs-28.2-r5.ebuild
View File

@@ -101,8 +101,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gtk? (
x11-libs/gtk+:3
xwidgets? (
|| ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
net-libs/webkit-gtk:4.1=
x11-libs/libXcomposite
)
)

8
app-editors/emacs/emacs-29.0.9999-r1.ebuild
View File

@@ -67,8 +67,7 @@ X_DEPEND="x11-libs/libICE
gtk? (
x11-libs/gtk+:3
xwidgets? (
|| ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
net-libs/webkit-gtk:4.1=
x11-libs/libXcomposite
)
)
@@ -138,10 +137,7 @@ 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 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
)
xwidgets? ( net-libs/webkit-gtk:4.1= )
) )
!gtk? ( ${X_DEPEND} )
X? ( ${X_DEPEND} )

8
app-editors/emacs/emacs-30.0.9999.ebuild
View File

@@ -67,8 +67,7 @@ X_DEPEND="x11-libs/libICE
gtk? (
x11-libs/gtk+:3
xwidgets? (
|| ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
net-libs/webkit-gtk:4.1=
x11-libs/libXcomposite
)
)
@@ -138,10 +137,7 @@ 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 net-libs/webkit-gtk:4 )
net-libs/webkit-gtk:=
)
xwidgets? ( net-libs/webkit-gtk:4.1= )
) )
!gtk? ( ${X_DEPEND} )
X? ( ${X_DEPEND} )