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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D46181382C5 for ; Mon, 31 May 2021 05:41:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19EF4E081A; Mon, 31 May 2021 05:41:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2349E081A for ; Mon, 31 May 2021 05:41:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B8D8340CA7 for ; Mon, 31 May 2021 05:41:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68055720 for ; Mon, 31 May 2021 05:41:16 +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: <1622439670.c9212800c9d3ecbcca2150dd68fc57c4b85fd29a.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-r4.ebuild app-editors/emacs/emacs-27.1-r4.ebuild app-editors/emacs/emacs-27.2.9999.ebuild app-editors/emacs/emacs-27.2.ebuild app-editors/emacs/emacs-28.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c9212800c9d3ecbcca2150dd68fc57c4b85fd29a X-VCS-Branch: master Date: Mon, 31 May 2021 05:41:16 +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: abeacd91-0aa8-49fe-8aae-3eb93ba50f24 X-Archives-Hash: ed7dbfad32634969208ec0baf4a594af commit: c9212800c9d3ecbcca2150dd68fc57c4b85fd29a Author: Ulrich Müller gentoo org> AuthorDate: Mon May 31 05:26:28 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon May 31 05:41:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9212800 app-editors/emacs: Clean up cleanup in src_install Upstream doesn't install /usr/share/appdata since some time. Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-26.3-r4.ebuild | 2 +- app-editors/emacs/emacs-27.1-r4.ebuild | 2 +- app-editors/emacs/emacs-27.2.9999.ebuild | 2 +- app-editors/emacs/emacs-27.2.ebuild | 2 +- app-editors/emacs/emacs-28.0.9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild index fe5c125a481..17aae4994de 100644 --- a/app-editors/emacs/emacs-26.3-r4.ebuild +++ b/app-editors/emacs/emacs-26.3-r4.ebuild @@ -262,7 +262,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/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild index 86cf0e3326d..e465593dcfc 100644 --- a/app-editors/emacs/emacs-27.1-r4.ebuild +++ b/app-editors/emacs/emacs-27.1-r4.ebuild @@ -326,7 +326,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/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild index 1efba0ded78..7089e4a9a73 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2.9999.ebuild @@ -325,7 +325,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/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild index 4c0d1595de9..e8a61860e0c 100644 --- a/app-editors/emacs/emacs-27.2.ebuild +++ b/app-editors/emacs/emacs-27.2.ebuild @@ -325,7 +325,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/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 67f83fec1f1..aeefea10ed8 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -315,7 +315,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/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die rm -rf "${ED}/usr/$(get_libdir)/systemd" || die rm -rf "${ED}"/var || die