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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 610C315800F for ; Mon, 13 Feb 2023 07:49:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 975EBE077F; Mon, 13 Feb 2023 07:49:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 7EE71E077F for ; Mon, 13 Feb 2023 07:49:15 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 712B5340DB2 for ; Mon, 13 Feb 2023 07:49:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E82547D0 for ; Mon, 13 Feb 2023 07:49:11 +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: <1676274451.a72d650cf5317dad3bd41cdaf735a5b18efcedd9.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-30.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a72d650cf5317dad3bd41cdaf735a5b18efcedd9 X-VCS-Branch: master Date: Mon, 13 Feb 2023 07:49:11 +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: 14f2cc66-cb72-4780-9f74-38e0170f0bbd X-Archives-Hash: 5b352708d46c0cf1b99750300554b54a commit: a72d650cf5317dad3bd41cdaf735a5b18efcedd9 Author: Ulrich Müller gentoo org> AuthorDate: Mon Feb 13 07:47:31 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Feb 13 07:47:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72d650c app-editors/emacs: Migrate from net-libs/webkit-gtk:4 to :4.1 Update live ebuild for master (slot 30-vcs). Closes: https://bugs.gentoo.org/893670 Signed-off-by: Ulrich Müller gentoo.org> 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 bd609dacece4..3f3d424ca125 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} )