commit: e8f93073b5aa09273fa5ba1770002c55827d7d41 Author: Marco Scardovi <marco <AT> scardovi <DOT> com> AuthorDate: Wed Apr 14 08:54:59 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Wed Apr 14 08:54:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8f93073
app-editors/atom-bin: drop nodejs The package itself already comes with npm/node. Providing a custom flag for nodejs is unuseful. This will not make any trouble if you use nodejs as atom will call it internally. Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com> app-editors/atom-bin/atom-bin-1.56.0.ebuild | 17 ++++------------- app-editors/atom-bin/metadata.xml | 3 --- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/app-editors/atom-bin/atom-bin-1.56.0.ebuild b/app-editors/atom-bin/atom-bin-1.56.0.ebuild index 40dab62ac..c8b51001d 100644 --- a/app-editors/atom-bin/atom-bin-1.56.0.ebuild +++ b/app-editors/atom-bin/atom-bin-1.56.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/atom/atom/releases/download/v${PV}/atom-amd64.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="alsa cups nodejs ssl test X" +IUSE="alsa cups ssl test X" RESTRICT="!test? ( test )" S="${WORKDIR}/atom-${PV}-amd64" @@ -26,7 +26,6 @@ RDEPEND=" dev-vcs/git alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) - nodejs? ( net-libs/nodejs[npm] ) ssl? ( dev-libs/openssl dev-libs/openssl-compat @@ -67,18 +66,10 @@ src_install(){ dosym ../../opt/"${PN}"/atom "${EPREFIX}"/usr/bin/atom fperms +x /opt/"${PN}"/atom - if use nodejs; then - rm resources/app/apm/bin/npm - rm resources/app/apm/BUNDLED_NODE_VERSION - - #Fix apm to use nodejs binary - sed -i "s#\$binDir\/\$nodeBin#\$\(which \$nodeBin\)#" resources/app/apm/bin/apm - else - fperms +x /opt/"${PN}"/resources/app/apm/bin/npm - fi - - fperms +x /opt/"${PN}"/resources/app/apm/bin/node + # I will use only npm provided with package itself fperms +x /opt/"${PN}"/resources/app/apm/bin/apm + fperms +x /opt/"${PN}"/resources/app/apm/bin/node + fperms +x /opt/"${PN}"/resources/app/apm/bin/npm doicon atom.png make_desktop_entry "/opt/atom-bin/atom %U" "Atom" "atom" \ diff --git a/app-editors/atom-bin/metadata.xml b/app-editors/atom-bin/metadata.xml index ada38d070..a0b29038e 100644 --- a/app-editors/atom-bin/metadata.xml +++ b/app-editors/atom-bin/metadata.xml @@ -8,7 +8,4 @@ <upstream> <remote-id type="github">atom/atom</remote-id> </upstream> - <use> - <flag name="nodejs">Enable nodejs support in USE</flag> - </use> </pkgmetadata>
