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 39EA21382C5 for ; Thu, 8 Apr 2021 10:12:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D70F9E08A0; Thu, 8 Apr 2021 10:12:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BED19E088F for ; Thu, 8 Apr 2021 10:12:10 +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 C2F9F340DDB for ; Thu, 8 Apr 2021 10:12:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46E1E71B for ; Thu, 8 Apr 2021 10:12:06 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1617863103.3a92be6f78812354e16668c8b3f14a918d78ecb8.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/atom-bin/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/atom-bin/atom-bin-1.55.0-r1.ebuild app-editors/atom-bin/atom-bin-1.55.0-r2.ebuild X-VCS-Directories: app-editors/atom-bin/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 3a92be6f78812354e16668c8b3f14a918d78ecb8 X-VCS-Branch: master Date: Thu, 8 Apr 2021 10:12:06 +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: 5b4c8526-5c28-48c7-a64e-297149128a10 X-Archives-Hash: 3121af1c761cfda8d98701684379a175 commit: 3a92be6f78812354e16668c8b3f14a918d78ecb8 Author: Marco Scardovi scardovi com> AuthorDate: Thu Apr 8 06:23:04 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Apr 8 06:25:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a92be6f app-editors/atom-bin: fix collision with nodejs Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> .../{atom-bin-1.55.0-r1.ebuild => atom-bin-1.55.0-r2.ebuild} | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app-editors/atom-bin/atom-bin-1.55.0-r1.ebuild b/app-editors/atom-bin/atom-bin-1.55.0-r2.ebuild similarity index 83% rename from app-editors/atom-bin/atom-bin-1.55.0-r1.ebuild rename to app-editors/atom-bin/atom-bin-1.55.0-r2.ebuild index b0478f02f..3d8522225 100644 --- a/app-editors/atom-bin/atom-bin-1.55.0-r1.ebuild +++ b/app-editors/atom-bin/atom-bin-1.55.0-r2.ebuild @@ -61,12 +61,9 @@ src_install(){ doins -r "${S}"/* dosym ../../opt/"${PN}"/atom "${EPREFIX}"/usr/bin/atom fperms +x /opt/"${PN}"/atom - dosym ../../opt/"${PN}"/resources/app/apm/bin/apm "${EPREFIX}"/usr/bin/apm fperms +x /opt/"${PN}"/resources/app/apm/bin/apm - dosym ../../opt/"${PN}"/resources/app/apm/bin/node "${EPREFIX}"/usr/bin/node fperms +x /opt/"${PN}"/resources/app/apm/bin/node - dosym ../../opt/"${PN}"/resources/app/apm/bin/npm "${EPREFIX}"/usr/bin/npm fperms +x /opt/"${PN}"/resources/app/apm/bin/npm - make_desktop_entry /opt/atom/atom Atom atom Utility + make_desktop_entry /opt/${PN}/atom Atom atom Utility doicon atom.png }