From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1537322-garchives=archives.gentoo.org@lists.gentoo.org> 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 00C6315800A for <garchives@archives.gentoo.org>; Fri, 14 Jul 2023 08:16:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20734E079C; Fri, 14 Jul 2023 08:16:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08504E079C for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jul 2023 08:16:17 +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 0FFA6335CA6 for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jul 2023 08:16:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48B9FA6A for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jul 2023 08:16:14 +0000 (UTC) From: "Ulrich Müller" <ulm@gentoo.org> 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" <ulm@gentoo.org> Message-ID: <1689322555.c99150cd3dee2eb600458646e9efa21acdfa6ce0.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-27.2-r13.ebuild app-editors/emacs/emacs-28.2-r9.ebuild app-editors/emacs/emacs-28.3_rc1-r4.ebuild app-editors/emacs/emacs-29.0.90.ebuild app-editors/emacs/emacs-29.0.91.ebuild app-editors/emacs/emacs-29.0.92.ebuild app-editors/emacs/emacs-29.0.9999-r1.ebuild 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: c99150cd3dee2eb600458646e9efa21acdfa6ce0 X-VCS-Branch: master Date: Fri, 14 Jul 2023 08:16:14 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e88f89cf-e6c2-4def-9016-e1933d40860b X-Archives-Hash: fd890b38544b64b7ee7ad7297e88dd2b commit: c99150cd3dee2eb600458646e9efa21acdfa6ce0 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Fri Jul 14 08:13:21 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Fri Jul 14 08:15:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99150cd app-editors/emacs: Don't depend on libXft when cairo is enabled Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/emacs/emacs-27.2-r13.ebuild | 2 +- app-editors/emacs/emacs-28.2-r9.ebuild | 2 +- app-editors/emacs/emacs-28.3_rc1-r4.ebuild | 2 +- app-editors/emacs/emacs-29.0.90.ebuild | 2 +- app-editors/emacs/emacs-29.0.91.ebuild | 2 +- app-editors/emacs/emacs-29.0.92.ebuild | 2 +- app-editors/emacs/emacs-29.0.9999-r1.ebuild | 2 +- app-editors/emacs/emacs-30.0.9999.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-editors/emacs/emacs-27.2-r13.ebuild b/app-editors/emacs/emacs-27.2-r13.ebuild index 599230cefa36..a44f2c0b6e68 100644 --- a/app-editors/emacs/emacs-27.2-r13.ebuild +++ b/app-editors/emacs/emacs-27.2-r13.ebuild @@ -87,9 +87,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-28.2-r9.ebuild b/app-editors/emacs/emacs-28.2-r9.ebuild index 65e04e528526..d097ec62e6fa 100644 --- a/app-editors/emacs/emacs-28.2-r9.ebuild +++ b/app-editors/emacs/emacs-28.2-r9.ebuild @@ -90,9 +90,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-28.3_rc1-r4.ebuild b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild index 6124017848c0..a53ea1f1c3f6 100644 --- a/app-editors/emacs/emacs-28.3_rc1-r4.ebuild +++ b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild @@ -90,9 +90,9 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-29.0.90.ebuild b/app-editors/emacs/emacs-29.0.90.ebuild index d47ea6f5e379..40153b2a3b6d 100644 --- a/app-editors/emacs/emacs-29.0.90.ebuild +++ b/app-editors/emacs/emacs-29.0.90.ebuild @@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-29.0.91.ebuild b/app-editors/emacs/emacs-29.0.91.ebuild index d47ea6f5e379..40153b2a3b6d 100644 --- a/app-editors/emacs/emacs-29.0.91.ebuild +++ b/app-editors/emacs/emacs-29.0.91.ebuild @@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-29.0.92.ebuild b/app-editors/emacs/emacs-29.0.92.ebuild index d47ea6f5e379..40153b2a3b6d 100644 --- a/app-editors/emacs/emacs-29.0.92.ebuild +++ b/app-editors/emacs/emacs-29.0.92.ebuild @@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild index d47ea6f5e379..40153b2a3b6d 100644 --- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild @@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 1bb789044d24..15ef46b178aa 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -55,9 +55,9 @@ X_DEPEND="x11-libs/libICE xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4