From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C34315800F for ; Sun, 12 Feb 2023 12:47:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF058E07DB; Sun, 12 Feb 2023 12:47:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92ACDE07DB for ; Sun, 12 Feb 2023 12:47:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 799E9340B0B for ; Sun, 12 Feb 2023 12:47:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02A4189C for ; Sun, 12 Feb 2023 12:47:43 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1676206054.a9edb784d35b35e055f0d26229063edf991c551b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-26.3-r12.ebuild app-editors/emacs/emacs-27.2-r10.ebuild app-editors/emacs/emacs-28.2-r5.ebuild app-editors/emacs/emacs-29.0.9999-r1.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a9edb784d35b35e055f0d26229063edf991c551b X-VCS-Branch: master Date: Sun, 12 Feb 2023 12:47:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d266a279-f2e5-458b-8044-51982fe20817 X-Archives-Hash: 3bcb2c65e151f9d96312ca52072aa0bc commit: a9edb784d35b35e055f0d26229063edf991c551b Author: Ulrich Müller gentoo org> AuthorDate: Sun Feb 12 12:46:38 2023 +0000 Commit: Ulrich Müller gentoo 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 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} )