Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/atom-bin/
Date: Thu, 08 Apr 2021 10:12:13
Message-Id: 1617863103.3a92be6f78812354e16668c8b3f14a918d78ecb8.andrewammerlaan@gentoo
1 commit: 3a92be6f78812354e16668c8b3f14a918d78ecb8
2 Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
3 AuthorDate: Thu Apr 8 06:23:04 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Thu Apr 8 06:25:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a92be6f
7
8 app-editors/atom-bin: fix collision with nodejs
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
12
13 .../{atom-bin-1.55.0-r1.ebuild => atom-bin-1.55.0-r2.ebuild} | 5 +----
14 1 file changed, 1 insertion(+), 4 deletions(-)
15
16 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
17 similarity index 83%
18 rename from app-editors/atom-bin/atom-bin-1.55.0-r1.ebuild
19 rename to app-editors/atom-bin/atom-bin-1.55.0-r2.ebuild
20 index b0478f02f..3d8522225 100644
21 --- a/app-editors/atom-bin/atom-bin-1.55.0-r1.ebuild
22 +++ b/app-editors/atom-bin/atom-bin-1.55.0-r2.ebuild
23 @@ -61,12 +61,9 @@ src_install(){
24 doins -r "${S}"/*
25 dosym ../../opt/"${PN}"/atom "${EPREFIX}"/usr/bin/atom
26 fperms +x /opt/"${PN}"/atom
27 - dosym ../../opt/"${PN}"/resources/app/apm/bin/apm "${EPREFIX}"/usr/bin/apm
28 fperms +x /opt/"${PN}"/resources/app/apm/bin/apm
29 - dosym ../../opt/"${PN}"/resources/app/apm/bin/node "${EPREFIX}"/usr/bin/node
30 fperms +x /opt/"${PN}"/resources/app/apm/bin/node
31 - dosym ../../opt/"${PN}"/resources/app/apm/bin/npm "${EPREFIX}"/usr/bin/npm
32 fperms +x /opt/"${PN}"/resources/app/apm/bin/npm
33 - make_desktop_entry /opt/atom/atom Atom atom Utility
34 + make_desktop_entry /opt/${PN}/atom Atom atom Utility
35 doicon atom.png
36 }