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 29BAD15800A for ; Mon, 24 Jul 2023 16:10:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21BE4E0819; Mon, 24 Jul 2023 16:10:27 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05F5FE0819 for ; Mon, 24 Jul 2023 16:10:27 +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 EEAB7340DFF for ; Mon, 24 Jul 2023 16:10:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45279BF9 for ; Mon, 24 Jul 2023 16:10:24 +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: <1690214721.538ec8834cfeed31b0b25216652a918dec54185f.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-29.1.9999.ebuild app-editors/emacs/emacs-29.1_rc1-r1.ebuild app-editors/emacs/emacs-29.1_rc1.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: 538ec8834cfeed31b0b25216652a918dec54185f X-VCS-Branch: master Date: Mon, 24 Jul 2023 16:10:24 +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: fc0c5edf-3792-4acb-989c-4cc89f9e4823 X-Archives-Hash: 0c7ed7b8087faf6254f46e85c9045e73 commit: 538ec8834cfeed31b0b25216652a918dec54185f Author: Ulrich Müller gentoo org> AuthorDate: Mon Jul 24 16:03:04 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Jul 24 16:05:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538ec883 app-editors/emacs: Don't install gsettings schema file This has been moved to app-emacs/emacs-common to avoid collisions between slots. Closes: https://bugs.gentoo.org/911117 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-29.1.9999.ebuild | 3 ++- app-editors/emacs/{emacs-29.1_rc1.ebuild => emacs-29.1_rc1-r1.ebuild} | 3 ++- app-editors/emacs/emacs-30.0.9999.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild index 40153b2a3b6d..584735ade1b5 100644 --- a/app-editors/emacs/emacs-29.1.9999.ebuild +++ b/app-editors/emacs/emacs-29.1.9999.ebuild @@ -92,7 +92,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gsettings(-)?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -450,6 +450,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 rm -rf "${ED}/usr/$(get_libdir)/systemd" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-29.1_rc1.ebuild b/app-editors/emacs/emacs-29.1_rc1-r1.ebuild similarity index 99% rename from app-editors/emacs/emacs-29.1_rc1.ebuild rename to app-editors/emacs/emacs-29.1_rc1-r1.ebuild index 40153b2a3b6d..584735ade1b5 100644 --- a/app-editors/emacs/emacs-29.1_rc1.ebuild +++ b/app-editors/emacs/emacs-29.1_rc1-r1.ebuild @@ -92,7 +92,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gsettings(-)?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -450,6 +450,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 rm -rf "${ED}/usr/$(get_libdir)/systemd" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 15ef46b178aa..eb4c9b4ae5ad 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -92,7 +92,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gsettings(-)?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -450,6 +450,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 rm -rf "${ED}/usr/$(get_libdir)/systemd" || die rm -rf "${ED}"/var || die