diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2023-02-18 16:34:14 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2023-02-18 16:42:17 +0100 |
| commit | 9efdc11e71b51ddd71accc91ed1bd1d737ecb42b (patch) | |
| tree | 2942c55cf7445d352cd426e68cb77ea7342a4e0a | |
| parent | media-tv/tvheadend: Restrict ffmpeg version in 9999 (diff) | |
| download | gentoo-9efdc11e71b51ddd71accc91ed1bd1d737ecb42b.tar.gz gentoo-9efdc11e71b51ddd71accc91ed1bd1d737ecb42b.tar.bz2 gentoo-9efdc11e71b51ddd71accc91ed1bd1d737ecb42b.zip | |
Revert "app-editors/emacs: Allow either of webkit-gtk:4.1 and :4"
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 a9edb784d35b35e055f0d26229063edf991c551b.
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | app-editors/emacs/emacs-26.3-r12.ebuild | 3 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.2-r10.ebuild | 3 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-28.2-r5.ebuild | 3 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-29.0.9999-r1.ebuild | 8 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-30.0.9999.ebuild | 8 |
5 files changed, 7 insertions, 18 deletions
diff --git a/app-editors/emacs/emacs-26.3-r12.ebuild b/app-editors/emacs/emacs-26.3-r12.ebuild index 0b9eb2080e3d..29c9491118fb 100644 --- a/app-editors/emacs/emacs-26.3-r12.ebuild +++ b/app-editors/emacs/emacs-26.3-r12.ebuild @@ -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 ) ) diff --git a/app-editors/emacs/emacs-27.2-r10.ebuild b/app-editors/emacs/emacs-27.2-r10.ebuild index 9071c259fe2c..be9e4f277203 100644 --- a/app-editors/emacs/emacs-27.2-r10.ebuild +++ b/app-editors/emacs/emacs-27.2-r10.ebuild @@ -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 ) ) diff --git a/app-editors/emacs/emacs-28.2-r5.ebuild b/app-editors/emacs/emacs-28.2-r5.ebuild index 14b618129cf0..6ffaf5fe8d0c 100644 --- a/app-editors/emacs/emacs-28.2-r5.ebuild +++ b/app-editors/emacs/emacs-28.2-r5.ebuild @@ -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 ) ) diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild index 4da879104fa7..b06274d3a565 100644 --- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild @@ -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} ) diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 3f3d424ca125..0a03ca0c6d54 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -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} ) |