commit: 538ec8834cfeed31b0b25216652a918dec54185f Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Jul 24 16:03:04 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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
