diff options
| -rw-r--r-- | app-editors/atom/atom-0.169.0.ebuild | 33 | ||||
| -rw-r--r-- | app-editors/atom/atom-0.174.0.ebuild | 33 |
2 files changed, 34 insertions, 32 deletions
diff --git a/app-editors/atom/atom-0.169.0.ebuild b/app-editors/atom/atom-0.169.0.ebuild index b927e56c..cc3cd990 100644 --- a/app-editors/atom/atom-0.169.0.ebuild +++ b/app-editors/atom/atom-0.169.0.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit git-r3 flag-o-matic python-any-r1 eutils +inherit git-2 flag-o-matic python-any-r1 eutils DESCRIPTION="A hackable text editor for the 21st Century" HOMEPAGE="https://atom.io" @@ -27,15 +27,15 @@ IUSE="" DEPEND=" ${PYTHON_DEPS} - dev-util/atom-shell:0/20 - >=net-libs/nodejs-0.10.30[npm] + =dev-util/atom-shell-0.20.5 + >=virtual/nodejs-1 media-fonts/inconsolata " - RDEPEND="${DEPEND}" -QA_PRESTRIPPED="/usr/share/atom/resources/app/node_modules/symbols-view/vendor/ctags-linux" - +QA_PRESTRIPPED=" + /usr/share/atom/node_modules/symbols-view/vendor/ctags-linux +" pkg_setup() { python-any-r1_pkg_setup @@ -43,33 +43,33 @@ pkg_setup() { } src_unpack() { - git-r3_src_unpack + git-2_src_unpack } src_prepare() { # Skip atom-shell download sed -i -e "s/defaultTasks = \['download-atom-shell', /defaultTasks = [/g" \ - ./build/Gruntfile.coffee \ - || die "Failed to fix Gruntfile" + ./build/Gruntfile.coffee \ + || die "Failed to fix Gruntfile" # Skip atom-shell copy epatch "${FILESDIR}/0002-skip-atom-shell-copy.patch" # Fix atom location guessing sed -i -e 's/ATOM_PATH="$USR_DIRECTORY\/share\/atom/ATOM_PATH="$USR_DIRECTORY\/../g' \ - ./atom.sh \ - || die "Fail fixing atom-shell directory" + ./atom.sh \ + || die "Fail fixing atom-shell directory" } src_compile() { ./script/build --verbose --build-dir "${T}" || die "Failed to compile" + "${T}/Atom/resources/app/apm/node_modules/atom-package-manager/bin/apm" rebuild || die "Failed to rebuild native module" - # Setup python path to builtin npm - echo "python = $PYTHON" >> "${T}/Atom/resources/app/apm/node_modules/atom-package-manager/.apmrc" } src_install() { - into /usr + + into /usr insinto /usr/share/applications @@ -87,7 +87,8 @@ src_install() { fperms +x /usr/share/${PN}/resources/app/atom.sh fperms +x /usr/share/${PN}/resources/app/apm/node_modules/.bin/apm fperms +x /usr/share/${PN}/resources/app/apm/node_modules/atom-package-manager/bin/node - fperms +x /usr/share/${PN}/resources/app/apm/node_modules/atom-package-manager/node_modules/npm/bin/node-gyp-bin/node-gyp + fperms +x /usr/share/${PN}/resources/app/node_modules/symbols-view/vendor/ctags-linux + fperms +x /usr/share/${PN}/resources/app/apm/node_modules/atom-package-manager/node_modules/npm/bin/node-gyp-bin/node-gyp # Symlinking to /usr/bin dosym ../share/${PN}/resources/app/atom.sh /usr/bin/atom diff --git a/app-editors/atom/atom-0.174.0.ebuild b/app-editors/atom/atom-0.174.0.ebuild index b927e56c..cc3cd990 100644 --- a/app-editors/atom/atom-0.174.0.ebuild +++ b/app-editors/atom/atom-0.174.0.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit git-r3 flag-o-matic python-any-r1 eutils +inherit git-2 flag-o-matic python-any-r1 eutils DESCRIPTION="A hackable text editor for the 21st Century" HOMEPAGE="https://atom.io" @@ -27,15 +27,15 @@ IUSE="" DEPEND=" ${PYTHON_DEPS} - dev-util/atom-shell:0/20 - >=net-libs/nodejs-0.10.30[npm] + =dev-util/atom-shell-0.20.5 + >=virtual/nodejs-1 media-fonts/inconsolata " - RDEPEND="${DEPEND}" -QA_PRESTRIPPED="/usr/share/atom/resources/app/node_modules/symbols-view/vendor/ctags-linux" - +QA_PRESTRIPPED=" + /usr/share/atom/node_modules/symbols-view/vendor/ctags-linux +" pkg_setup() { python-any-r1_pkg_setup @@ -43,33 +43,33 @@ pkg_setup() { } src_unpack() { - git-r3_src_unpack + git-2_src_unpack } src_prepare() { # Skip atom-shell download sed -i -e "s/defaultTasks = \['download-atom-shell', /defaultTasks = [/g" \ - ./build/Gruntfile.coffee \ - || die "Failed to fix Gruntfile" + ./build/Gruntfile.coffee \ + || die "Failed to fix Gruntfile" # Skip atom-shell copy epatch "${FILESDIR}/0002-skip-atom-shell-copy.patch" # Fix atom location guessing sed -i -e 's/ATOM_PATH="$USR_DIRECTORY\/share\/atom/ATOM_PATH="$USR_DIRECTORY\/../g' \ - ./atom.sh \ - || die "Fail fixing atom-shell directory" + ./atom.sh \ + || die "Fail fixing atom-shell directory" } src_compile() { ./script/build --verbose --build-dir "${T}" || die "Failed to compile" + "${T}/Atom/resources/app/apm/node_modules/atom-package-manager/bin/apm" rebuild || die "Failed to rebuild native module" - # Setup python path to builtin npm - echo "python = $PYTHON" >> "${T}/Atom/resources/app/apm/node_modules/atom-package-manager/.apmrc" } src_install() { - into /usr + + into /usr insinto /usr/share/applications @@ -87,7 +87,8 @@ src_install() { fperms +x /usr/share/${PN}/resources/app/atom.sh fperms +x /usr/share/${PN}/resources/app/apm/node_modules/.bin/apm fperms +x /usr/share/${PN}/resources/app/apm/node_modules/atom-package-manager/bin/node - fperms +x /usr/share/${PN}/resources/app/apm/node_modules/atom-package-manager/node_modules/npm/bin/node-gyp-bin/node-gyp + fperms +x /usr/share/${PN}/resources/app/node_modules/symbols-view/vendor/ctags-linux + fperms +x /usr/share/${PN}/resources/app/apm/node_modules/atom-package-manager/node_modules/npm/bin/node-gyp-bin/node-gyp # Symlinking to /usr/bin dosym ../share/${PN}/resources/app/atom.sh /usr/bin/atom |