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 0A039138359 for ; Wed, 12 Aug 2020 08:19:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0985FE092B; Wed, 12 Aug 2020 08:19:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E4A13E092B for ; Wed, 12 Aug 2020 08:19:28 +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 903EA34F4D0 for ; Wed, 12 Aug 2020 08:19:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A25E2D2 for ; Wed, 12 Aug 2020 08:19:26 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1597220360.a6a587ba8d374cc20de8c692d393e807154e4195.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nano/nano-9999.ebuild X-VCS-Directories: app-editors/nano/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a6a587ba8d374cc20de8c692d393e807154e4195 X-VCS-Branch: master Date: Wed, 12 Aug 2020 08:19:26 +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: 97707473-bbf7-40e6-90ef-4953ebe4f207 X-Archives-Hash: 211eca2128281933832335aeb662eb2a commit: a6a587ba8d374cc20de8c692d393e807154e4195 Author: Lars Wendler gentoo org> AuthorDate: Wed Aug 12 08:19:12 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Aug 12 08:19:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a587ba app-editors/nano: Synced live ebuild Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> app-editors/nano/nano-9999.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index e49803f3fe5..1a12756b35a 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -79,5 +79,11 @@ src_install() { "${ED}"/etc/nanorc || die fi + # Since nano-5.0 these are no longer being "enabled" by default + # (bug #736848) + local rcdir="/usr/share/nano" + mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die + rmdir "${ED}"${rcdir}/extra || die + use split-usr && dosym ../../bin/nano /usr/bin/nano }