Date: Saturday, October 14, 2017 @ 10:43:08 Author: tensor5 Revision: 262731
archrelease: copy trunk to community-i686, community-x86_64 Added: apm/repos/community-i686/PKGBUILD (from rev 262730, apm/trunk/PKGBUILD) apm/repos/community-i686/apm.js (from rev 262730, apm/trunk/apm.js) apm/repos/community-i686/no-scripts.patch (from rev 262730, apm/trunk/no-scripts.patch) apm/repos/community-i686/python2.patch (from rev 262730, apm/trunk/python2.patch) apm/repos/community-i686/use-system-npm.patch (from rev 262730, apm/trunk/use-system-npm.patch) apm/repos/community-x86_64/PKGBUILD (from rev 262730, apm/trunk/PKGBUILD) apm/repos/community-x86_64/apm.js (from rev 262730, apm/trunk/apm.js) apm/repos/community-x86_64/no-scripts.patch (from rev 262730, apm/trunk/no-scripts.patch) apm/repos/community-x86_64/python2.patch (from rev 262730, apm/trunk/python2.patch) apm/repos/community-x86_64/use-system-npm.patch (from rev 262730, apm/trunk/use-system-npm.patch) Deleted: apm/repos/community-i686/PKGBUILD apm/repos/community-i686/apm.js apm/repos/community-i686/no-scripts.patch apm/repos/community-i686/python2.patch apm/repos/community-i686/use-system-npm.patch apm/repos/community-x86_64/PKGBUILD apm/repos/community-x86_64/apm.js apm/repos/community-x86_64/no-scripts.patch apm/repos/community-x86_64/python2.patch apm/repos/community-x86_64/use-system-npm.patch ---------------------------------------+ /PKGBUILD | 206 ++++++++++++++++++++++++++++++++ /apm.js | 32 ++++ /no-scripts.patch | 32 ++++ /python2.patch | 28 ++++ /use-system-npm.patch | 66 ++++++++++ community-i686/PKGBUILD | 101 --------------- community-i686/apm.js | 16 -- community-i686/no-scripts.patch | 16 -- community-i686/python2.patch | 14 -- community-i686/use-system-npm.patch | 33 ----- community-x86_64/PKGBUILD | 101 --------------- community-x86_64/apm.js | 16 -- community-x86_64/no-scripts.patch | 16 -- community-x86_64/python2.patch | 14 -- community-x86_64/use-system-npm.patch | 33 ----- 15 files changed, 364 insertions(+), 360 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-10-14 10:42:30 UTC (rev 262730) +++ community-i686/PKGBUILD 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,101 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=apm -pkgver=1.18.5 -pkgrel=1 -pkgdesc='Atom package manager' -arch=('i686' 'x86_64') -url='https://github.com/atom/apm' -license=('MIT') -depends=('libsecret' 'nodejs>=8' 'npm' 'python2') -makedepends=('coffee-script' 'git') -provides=('nodejs-atom-package-manager') -conflicts=('nodejs-atom-package-manager') -replaces=('nodejs-atom-package-manager') -options=(!emptydirs) -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz" - 'apm.js' - 'no-scripts.patch' - 'python2.patch' - 'use-system-npm.patch') -sha256sums=('e65e4ebc94e95108798677791483401eadcdee99e10f27a5634a82da67067528' - '4ae1e5388ec2c52d8893d56a8df816e8aa69f54690801a9d283771133b4b3752' - '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562' - '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792' - '6365e052011d1b129741bdb510a4898c766a19385047ce18eb95fa54b334e52a') - -_apmdir='/usr/lib/node_modules/atom-package-manager' - -prepare() { - rm -rf "${srcdir}"/apm-build - - cd apm-${pkgver} - - # Use custom launcher - rm bin/apm{,.cmd} bin/npm{,.cmd} - rm src/cli.coffee - install -m755 "${srcdir}"/apm.js bin/apm - - # Use system npm - patch -Np1 -i "${srcdir}"/use-system-npm.patch - - # Don't download binary Node - patch -Np1 -i "${srcdir}"/no-scripts.patch - rm BUNDLED_NODE_VERSION script/* - - # GYP needs Python2 - patch -Np1 -i "${srcdir}"/python2.patch -} - -build() { - cd apm-${pkgver} - - coffee -c --no-header -o lib src/*.coffee - npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1) -} - -package() { - cp -r "${srcdir}"/apm-build/usr "${pkgdir}" - - cd "${pkgdir}"${_apmdir} - install -m644 "${srcdir}"/apm-${pkgver}/README.md ./ - - # Install license file - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \ - "${pkgdir}/usr/share/licenses/${pkgname}" - - # Remove occurrences of ${srcdir} - find "${pkgdir}" -name "package.json" \ - -exec sed -e "s|${srcdir}/apm-build||" \ - -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \ - -i '{}' \; - - # Remove useless stuff - find "${pkgdir}"/usr/lib \ - -name ".*" -prune -exec rm -r '{}' \; \ - -or -name "*.a" -exec rm '{}' \; \ - -or -name "*.bat" -exec rm '{}' \; \ - -or -name "*.mk" -exec rm '{}' \; \ - -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \ - -or -path "*/git-utils/src" -prune -exec rm -r '{}' \; \ - -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \ - -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \ - -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \ - -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \ - -or -name "appveyor.yml" -exec rm '{}' \; \ - -or -name "benchmark" -prune -exec rm -r '{}' \; \ - -or -name "binding.Makefile" -exec rm '{}' \; \ - -or -name "config.gypi" -exec rm '{}' \; \ - -or -name "deps" -prune -exec rm -r '{}' \; \ - -or -name "doc" -prune -exec rm -r '{}' \; \ - -or -name "html" -prune -exec rm -r '{}' \; \ - -or -name "Makefile" -exec rm '{}' \; \ - -or -name "man" -prune -exec rm -r '{}' \; \ - -or -name "obj.target" -prune -exec rm -r '{}' \; \ - -or -name "samples" -prune -exec rm -r '{}' \; \ - -or -name "scripts" -prune -exec rm -r '{}' \; \ - -or -name "test" -prune -exec rm -r '{}' \; \ - -or -name "tests" -prune -exec rm -r '{}' \; -} Copied: apm/repos/community-i686/PKGBUILD (from rev 262730, apm/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,103 @@ +# $Id$ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=apm +pkgver=1.18.8 +pkgrel=1 +pkgdesc='Atom package manager' +arch=('i686' 'x86_64') +url='https://github.com/atom/apm' +license=('MIT') +depends=('libsecret' 'nodejs>=8' 'npm' 'python2') +makedepends=('git') +provides=('nodejs-atom-package-manager') +conflicts=('nodejs-atom-package-manager') +replaces=('nodejs-atom-package-manager') +options=(!emptydirs) +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz" + 'apm.js' + 'no-scripts.patch' + 'python2.patch' + 'use-system-npm.patch') +sha256sums=('86e6a8e0073a88c4338ee749e07e748978e4a3fbc11f6e79df888f003f236e1d' + '4e7f0bae3a54758c5e75dcb71bb7b22c1c499e7353461f360ff7cb22f9851235' + '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562' + '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792' + '6365e052011d1b129741bdb510a4898c766a19385047ce18eb95fa54b334e52a') + +_apmdir='/usr/lib/node_modules/atom-package-manager' + +prepare() { + rm -rf "${srcdir}"/apm-build + + cd apm-${pkgver} + + # Use custom launcher + rm bin/apm{,.cmd} bin/npm{,.cmd} + rm src/cli.coffee + install -m755 "${srcdir}"/apm.js bin/apm + + # Use system npm + patch -Np1 -i "${srcdir}"/use-system-npm.patch + + # Don't download binary Node + patch -Np1 -i "${srcdir}"/no-scripts.patch + rm BUNDLED_NODE_VERSION script/* + + # GYP needs Python2 + patch -Np1 -i "${srcdir}"/python2.patch +} + +build() { + cd apm-${pkgver} + + npm install coffee-script + ./node_modules/.bin/coffee -c --no-header -o lib src/*.coffee + rm -r node_modules + npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1) +} + +package() { + cp -r "${srcdir}"/apm-build/usr "${pkgdir}" + + cd "${pkgdir}"${_apmdir} + install -m644 "${srcdir}"/apm-${pkgver}/README.md ./ + + # Install license file + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \ + "${pkgdir}/usr/share/licenses/${pkgname}" + + # Remove occurrences of ${srcdir} + find "${pkgdir}" -name "package.json" \ + -exec sed -e "s|${srcdir}/apm-build||" \ + -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \ + -i '{}' \; + + # Remove useless stuff + find "${pkgdir}"/usr/lib \ + -name ".*" -prune -exec rm -r '{}' \; \ + -or -name "*.a" -exec rm '{}' \; \ + -or -name "*.bat" -exec rm '{}' \; \ + -or -name "*.mk" -exec rm '{}' \; \ + -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \ + -or -path "*/git-utils/src" -prune -exec rm -r '{}' \; \ + -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \ + -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \ + -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \ + -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \ + -or -name "appveyor.yml" -exec rm '{}' \; \ + -or -name "benchmark" -prune -exec rm -r '{}' \; \ + -or -name "binding.Makefile" -exec rm '{}' \; \ + -or -name "config.gypi" -exec rm '{}' \; \ + -or -name "deps" -prune -exec rm -r '{}' \; \ + -or -name "doc" -prune -exec rm -r '{}' \; \ + -or -name "html" -prune -exec rm -r '{}' \; \ + -or -name "Makefile" -exec rm '{}' \; \ + -or -name "man" -prune -exec rm -r '{}' \; \ + -or -name "obj.target" -prune -exec rm -r '{}' \; \ + -or -name "samples" -prune -exec rm -r '{}' \; \ + -or -name "scripts" -prune -exec rm -r '{}' \; \ + -or -name "test" -prune -exec rm -r '{}' \; \ + -or -name "tests" -prune -exec rm -r '{}' \; +} Deleted: community-i686/apm.js =================================================================== --- community-i686/apm.js 2017-10-14 10:42:30 UTC (rev 262730) +++ community-i686/apm.js 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,16 +0,0 @@ -#!/usr/bin/node - -'use strict'; - -process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || - '/usr/lib/atom'; - -process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || - require('fs') - .readFileSync('/usr/lib/electron/version', 'utf8').trim().slice(1); - -process.env.PYTHON = __dirname + "/python-interceptor.sh"; - -require('../lib/apm-cli.js').run(process.argv.slice(2), function (error) { - process.exitCode = +!!error; -}); Copied: apm/repos/community-i686/apm.js (from rev 262730, apm/trunk/apm.js) =================================================================== --- community-i686/apm.js (rev 0) +++ community-i686/apm.js 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,16 @@ +#!/usr/bin/node + +"use strict"; + +process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || + "/usr/lib/atom"; + +process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || + require("fs") + .readFileSync("/usr/lib/electron/version", "utf8").trim().slice(1); + +process.env.npm_config_python = __dirname + "/python-interceptor.sh"; + +require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { + process.exitCode = +!!error; +}); Deleted: community-i686/no-scripts.patch =================================================================== --- community-i686/no-scripts.patch 2017-10-14 10:42:30 UTC (rev 262730) +++ community-i686/no-scripts.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,16 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -14,13 +14,6 @@ - "bin": { - "apm": "./bin/apm" - }, -- "scripts": { -- "build": "node script/check-version.js && grunt", -- "prepublish": "grunt prepublish", -- "install": "node script/postinstall.js", -- "test": "node script/check-version.js && grunt test", -- "check-version": "node version.js" -- }, - "dependencies": { - "asar-require": "0.3.0", - "async": "~0.2.8", Copied: apm/repos/community-i686/no-scripts.patch (from rev 262730, apm/trunk/no-scripts.patch) =================================================================== --- community-i686/no-scripts.patch (rev 0) +++ community-i686/no-scripts.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,16 @@ +--- a/package.json ++++ b/package.json +@@ -14,13 +14,6 @@ + "bin": { + "apm": "./bin/apm" + }, +- "scripts": { +- "build": "node script/check-version.js && grunt", +- "prepublish": "grunt prepublish", +- "install": "node script/postinstall.js", +- "test": "node script/check-version.js && grunt test", +- "check-version": "node version.js" +- }, + "dependencies": { + "asar-require": "0.3.0", + "async": "~0.2.8", Deleted: community-i686/python2.patch =================================================================== --- community-i686/python2.patch 2017-10-14 10:42:30 UTC (rev 262730) +++ community-i686/python2.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,14 +0,0 @@ ---- a/bin/python-interceptor.sh -+++ b/bin/python-interceptor.sh -@@ -34,9 +34,9 @@ - ARGS+=("--format=safemake.py") - fi - -- exec python "${ARGS[@]}" -+ exec python2 "${ARGS[@]}" - ;; - *) -- exec python "$@" -+ exec python2 "$@" - ;; - esac Copied: apm/repos/community-i686/python2.patch (from rev 262730, apm/trunk/python2.patch) =================================================================== --- community-i686/python2.patch (rev 0) +++ community-i686/python2.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,14 @@ +--- a/bin/python-interceptor.sh ++++ b/bin/python-interceptor.sh +@@ -34,9 +34,9 @@ + ARGS+=("--format=safemake.py") + fi + +- exec python "${ARGS[@]}" ++ exec python2 "${ARGS[@]}" + ;; + *) +- exec python "$@" ++ exec python2 "$@" + ;; + esac Deleted: community-i686/use-system-npm.patch =================================================================== --- community-i686/use-system-npm.patch 2017-10-14 10:42:30 UTC (rev 262730) +++ community-i686/use-system-npm.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,33 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -32,8 +32,6 @@ - "keytar": "^4.0", - "mv": "2.0.0", - "ncp": "~0.5.1", -- "npm": "3.10.10", -- "node-gyp": "3.4.0", - "open": "0.0.4", - "plist": "git+https://github.com/nathansobo/node-plist.git", - "q": "~0.9.7", ---- a/src/dedupe.coffee -+++ b/src/dedupe.coffee -@@ -17,7 +17,7 @@ - @atomPackagesDirectory = path.join(@atomDirectory, 'packages') - @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp') - @atomNpmPath = require.resolve('npm/bin/npm-cli') -- @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp') -+ @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp') - - parseOptions: (argv) -> - options = yargs(argv).wrap(100) ---- a/src/install.coffee -+++ b/src/install.coffee -@@ -84,7 +84,7 @@ - opts = {env, cwd: @atomDirectory} - opts.streaming = true if @verbose - -- atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp') -+ atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp') - @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') -> - if code is 0 - callback() Copied: apm/repos/community-i686/use-system-npm.patch (from rev 262730, apm/trunk/use-system-npm.patch) =================================================================== --- community-i686/use-system-npm.patch (rev 0) +++ community-i686/use-system-npm.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,33 @@ +--- a/package.json ++++ b/package.json +@@ -32,8 +32,6 @@ + "keytar": "^4.0", + "mv": "2.0.0", + "ncp": "~0.5.1", +- "npm": "3.10.10", +- "node-gyp": "3.4.0", + "open": "0.0.4", + "plist": "git+https://github.com/nathansobo/node-plist.git", + "q": "~0.9.7", +--- a/src/dedupe.coffee ++++ b/src/dedupe.coffee +@@ -17,7 +17,7 @@ + @atomPackagesDirectory = path.join(@atomDirectory, 'packages') + @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp') + @atomNpmPath = require.resolve('npm/bin/npm-cli') +- @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp') ++ @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp') + + parseOptions: (argv) -> + options = yargs(argv).wrap(100) +--- a/src/install.coffee ++++ b/src/install.coffee +@@ -84,7 +84,7 @@ + opts = {env, cwd: @atomDirectory} + opts.streaming = true if @verbose + +- atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp') ++ atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp') + @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') -> + if code is 0 + callback() Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-10-14 10:42:30 UTC (rev 262730) +++ community-x86_64/PKGBUILD 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,101 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=apm -pkgver=1.18.5 -pkgrel=1 -pkgdesc='Atom package manager' -arch=('i686' 'x86_64') -url='https://github.com/atom/apm' -license=('MIT') -depends=('libsecret' 'nodejs>=8' 'npm' 'python2') -makedepends=('coffee-script' 'git') -provides=('nodejs-atom-package-manager') -conflicts=('nodejs-atom-package-manager') -replaces=('nodejs-atom-package-manager') -options=(!emptydirs) -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz" - 'apm.js' - 'no-scripts.patch' - 'python2.patch' - 'use-system-npm.patch') -sha256sums=('e65e4ebc94e95108798677791483401eadcdee99e10f27a5634a82da67067528' - '4ae1e5388ec2c52d8893d56a8df816e8aa69f54690801a9d283771133b4b3752' - '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562' - '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792' - '6365e052011d1b129741bdb510a4898c766a19385047ce18eb95fa54b334e52a') - -_apmdir='/usr/lib/node_modules/atom-package-manager' - -prepare() { - rm -rf "${srcdir}"/apm-build - - cd apm-${pkgver} - - # Use custom launcher - rm bin/apm{,.cmd} bin/npm{,.cmd} - rm src/cli.coffee - install -m755 "${srcdir}"/apm.js bin/apm - - # Use system npm - patch -Np1 -i "${srcdir}"/use-system-npm.patch - - # Don't download binary Node - patch -Np1 -i "${srcdir}"/no-scripts.patch - rm BUNDLED_NODE_VERSION script/* - - # GYP needs Python2 - patch -Np1 -i "${srcdir}"/python2.patch -} - -build() { - cd apm-${pkgver} - - coffee -c --no-header -o lib src/*.coffee - npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1) -} - -package() { - cp -r "${srcdir}"/apm-build/usr "${pkgdir}" - - cd "${pkgdir}"${_apmdir} - install -m644 "${srcdir}"/apm-${pkgver}/README.md ./ - - # Install license file - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \ - "${pkgdir}/usr/share/licenses/${pkgname}" - - # Remove occurrences of ${srcdir} - find "${pkgdir}" -name "package.json" \ - -exec sed -e "s|${srcdir}/apm-build||" \ - -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \ - -i '{}' \; - - # Remove useless stuff - find "${pkgdir}"/usr/lib \ - -name ".*" -prune -exec rm -r '{}' \; \ - -or -name "*.a" -exec rm '{}' \; \ - -or -name "*.bat" -exec rm '{}' \; \ - -or -name "*.mk" -exec rm '{}' \; \ - -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \ - -or -path "*/git-utils/src" -prune -exec rm -r '{}' \; \ - -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \ - -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \ - -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \ - -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \ - -or -name "appveyor.yml" -exec rm '{}' \; \ - -or -name "benchmark" -prune -exec rm -r '{}' \; \ - -or -name "binding.Makefile" -exec rm '{}' \; \ - -or -name "config.gypi" -exec rm '{}' \; \ - -or -name "deps" -prune -exec rm -r '{}' \; \ - -or -name "doc" -prune -exec rm -r '{}' \; \ - -or -name "html" -prune -exec rm -r '{}' \; \ - -or -name "Makefile" -exec rm '{}' \; \ - -or -name "man" -prune -exec rm -r '{}' \; \ - -or -name "obj.target" -prune -exec rm -r '{}' \; \ - -or -name "samples" -prune -exec rm -r '{}' \; \ - -or -name "scripts" -prune -exec rm -r '{}' \; \ - -or -name "test" -prune -exec rm -r '{}' \; \ - -or -name "tests" -prune -exec rm -r '{}' \; -} Copied: apm/repos/community-x86_64/PKGBUILD (from rev 262730, apm/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,103 @@ +# $Id$ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=apm +pkgver=1.18.8 +pkgrel=1 +pkgdesc='Atom package manager' +arch=('i686' 'x86_64') +url='https://github.com/atom/apm' +license=('MIT') +depends=('libsecret' 'nodejs>=8' 'npm' 'python2') +makedepends=('git') +provides=('nodejs-atom-package-manager') +conflicts=('nodejs-atom-package-manager') +replaces=('nodejs-atom-package-manager') +options=(!emptydirs) +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz" + 'apm.js' + 'no-scripts.patch' + 'python2.patch' + 'use-system-npm.patch') +sha256sums=('86e6a8e0073a88c4338ee749e07e748978e4a3fbc11f6e79df888f003f236e1d' + '4e7f0bae3a54758c5e75dcb71bb7b22c1c499e7353461f360ff7cb22f9851235' + '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562' + '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792' + '6365e052011d1b129741bdb510a4898c766a19385047ce18eb95fa54b334e52a') + +_apmdir='/usr/lib/node_modules/atom-package-manager' + +prepare() { + rm -rf "${srcdir}"/apm-build + + cd apm-${pkgver} + + # Use custom launcher + rm bin/apm{,.cmd} bin/npm{,.cmd} + rm src/cli.coffee + install -m755 "${srcdir}"/apm.js bin/apm + + # Use system npm + patch -Np1 -i "${srcdir}"/use-system-npm.patch + + # Don't download binary Node + patch -Np1 -i "${srcdir}"/no-scripts.patch + rm BUNDLED_NODE_VERSION script/* + + # GYP needs Python2 + patch -Np1 -i "${srcdir}"/python2.patch +} + +build() { + cd apm-${pkgver} + + npm install coffee-script + ./node_modules/.bin/coffee -c --no-header -o lib src/*.coffee + rm -r node_modules + npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1) +} + +package() { + cp -r "${srcdir}"/apm-build/usr "${pkgdir}" + + cd "${pkgdir}"${_apmdir} + install -m644 "${srcdir}"/apm-${pkgver}/README.md ./ + + # Install license file + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \ + "${pkgdir}/usr/share/licenses/${pkgname}" + + # Remove occurrences of ${srcdir} + find "${pkgdir}" -name "package.json" \ + -exec sed -e "s|${srcdir}/apm-build||" \ + -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \ + -i '{}' \; + + # Remove useless stuff + find "${pkgdir}"/usr/lib \ + -name ".*" -prune -exec rm -r '{}' \; \ + -or -name "*.a" -exec rm '{}' \; \ + -or -name "*.bat" -exec rm '{}' \; \ + -or -name "*.mk" -exec rm '{}' \; \ + -or -path "*/git-utils/binding.gyp" -exec rm '{}' \; \ + -or -path "*/git-utils/src" -prune -exec rm -r '{}' \; \ + -or -path "*/keytar/binding.gyp" -exec rm '{}' \; \ + -or -path "*/keytar/src" -prune -exec rm -r '{}' \; \ + -or -path "*/oniguruma/binding.gyp" -exec rm '{}' \; \ + -or -path "*/oniguruma/src" -prune -exec rm -r '{}' \; \ + -or -name "appveyor.yml" -exec rm '{}' \; \ + -or -name "benchmark" -prune -exec rm -r '{}' \; \ + -or -name "binding.Makefile" -exec rm '{}' \; \ + -or -name "config.gypi" -exec rm '{}' \; \ + -or -name "deps" -prune -exec rm -r '{}' \; \ + -or -name "doc" -prune -exec rm -r '{}' \; \ + -or -name "html" -prune -exec rm -r '{}' \; \ + -or -name "Makefile" -exec rm '{}' \; \ + -or -name "man" -prune -exec rm -r '{}' \; \ + -or -name "obj.target" -prune -exec rm -r '{}' \; \ + -or -name "samples" -prune -exec rm -r '{}' \; \ + -or -name "scripts" -prune -exec rm -r '{}' \; \ + -or -name "test" -prune -exec rm -r '{}' \; \ + -or -name "tests" -prune -exec rm -r '{}' \; +} Deleted: community-x86_64/apm.js =================================================================== --- community-x86_64/apm.js 2017-10-14 10:42:30 UTC (rev 262730) +++ community-x86_64/apm.js 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,16 +0,0 @@ -#!/usr/bin/node - -'use strict'; - -process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || - '/usr/lib/atom'; - -process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || - require('fs') - .readFileSync('/usr/lib/electron/version', 'utf8').trim().slice(1); - -process.env.PYTHON = __dirname + "/python-interceptor.sh"; - -require('../lib/apm-cli.js').run(process.argv.slice(2), function (error) { - process.exitCode = +!!error; -}); Copied: apm/repos/community-x86_64/apm.js (from rev 262730, apm/trunk/apm.js) =================================================================== --- community-x86_64/apm.js (rev 0) +++ community-x86_64/apm.js 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,16 @@ +#!/usr/bin/node + +"use strict"; + +process.env.ATOM_RESOURCE_PATH = process.env.ATOM_RESOURCE_PATH || + "/usr/lib/atom"; + +process.env.ATOM_ELECTRON_VERSION = process.env.ATOM_ELECTRON_VERSION || + require("fs") + .readFileSync("/usr/lib/electron/version", "utf8").trim().slice(1); + +process.env.npm_config_python = __dirname + "/python-interceptor.sh"; + +require("../lib/apm-cli.js").run(process.argv.slice(2), function (error) { + process.exitCode = +!!error; +}); Deleted: community-x86_64/no-scripts.patch =================================================================== --- community-x86_64/no-scripts.patch 2017-10-14 10:42:30 UTC (rev 262730) +++ community-x86_64/no-scripts.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,16 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -14,13 +14,6 @@ - "bin": { - "apm": "./bin/apm" - }, -- "scripts": { -- "build": "node script/check-version.js && grunt", -- "prepublish": "grunt prepublish", -- "install": "node script/postinstall.js", -- "test": "node script/check-version.js && grunt test", -- "check-version": "node version.js" -- }, - "dependencies": { - "asar-require": "0.3.0", - "async": "~0.2.8", Copied: apm/repos/community-x86_64/no-scripts.patch (from rev 262730, apm/trunk/no-scripts.patch) =================================================================== --- community-x86_64/no-scripts.patch (rev 0) +++ community-x86_64/no-scripts.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,16 @@ +--- a/package.json ++++ b/package.json +@@ -14,13 +14,6 @@ + "bin": { + "apm": "./bin/apm" + }, +- "scripts": { +- "build": "node script/check-version.js && grunt", +- "prepublish": "grunt prepublish", +- "install": "node script/postinstall.js", +- "test": "node script/check-version.js && grunt test", +- "check-version": "node version.js" +- }, + "dependencies": { + "asar-require": "0.3.0", + "async": "~0.2.8", Deleted: community-x86_64/python2.patch =================================================================== --- community-x86_64/python2.patch 2017-10-14 10:42:30 UTC (rev 262730) +++ community-x86_64/python2.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,14 +0,0 @@ ---- a/bin/python-interceptor.sh -+++ b/bin/python-interceptor.sh -@@ -34,9 +34,9 @@ - ARGS+=("--format=safemake.py") - fi - -- exec python "${ARGS[@]}" -+ exec python2 "${ARGS[@]}" - ;; - *) -- exec python "$@" -+ exec python2 "$@" - ;; - esac Copied: apm/repos/community-x86_64/python2.patch (from rev 262730, apm/trunk/python2.patch) =================================================================== --- community-x86_64/python2.patch (rev 0) +++ community-x86_64/python2.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,14 @@ +--- a/bin/python-interceptor.sh ++++ b/bin/python-interceptor.sh +@@ -34,9 +34,9 @@ + ARGS+=("--format=safemake.py") + fi + +- exec python "${ARGS[@]}" ++ exec python2 "${ARGS[@]}" + ;; + *) +- exec python "$@" ++ exec python2 "$@" + ;; + esac Deleted: community-x86_64/use-system-npm.patch =================================================================== --- community-x86_64/use-system-npm.patch 2017-10-14 10:42:30 UTC (rev 262730) +++ community-x86_64/use-system-npm.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -1,33 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -32,8 +32,6 @@ - "keytar": "^4.0", - "mv": "2.0.0", - "ncp": "~0.5.1", -- "npm": "3.10.10", -- "node-gyp": "3.4.0", - "open": "0.0.4", - "plist": "git+https://github.com/nathansobo/node-plist.git", - "q": "~0.9.7", ---- a/src/dedupe.coffee -+++ b/src/dedupe.coffee -@@ -17,7 +17,7 @@ - @atomPackagesDirectory = path.join(@atomDirectory, 'packages') - @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp') - @atomNpmPath = require.resolve('npm/bin/npm-cli') -- @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp') -+ @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp') - - parseOptions: (argv) -> - options = yargs(argv).wrap(100) ---- a/src/install.coffee -+++ b/src/install.coffee -@@ -84,7 +84,7 @@ - opts = {env, cwd: @atomDirectory} - opts.streaming = true if @verbose - -- atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp') -+ atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp') - @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') -> - if code is 0 - callback() Copied: apm/repos/community-x86_64/use-system-npm.patch (from rev 262730, apm/trunk/use-system-npm.patch) =================================================================== --- community-x86_64/use-system-npm.patch (rev 0) +++ community-x86_64/use-system-npm.patch 2017-10-14 10:43:08 UTC (rev 262731) @@ -0,0 +1,33 @@ +--- a/package.json ++++ b/package.json +@@ -32,8 +32,6 @@ + "keytar": "^4.0", + "mv": "2.0.0", + "ncp": "~0.5.1", +- "npm": "3.10.10", +- "node-gyp": "3.4.0", + "open": "0.0.4", + "plist": "git+https://github.com/nathansobo/node-plist.git", + "q": "~0.9.7", +--- a/src/dedupe.coffee ++++ b/src/dedupe.coffee +@@ -17,7 +17,7 @@ + @atomPackagesDirectory = path.join(@atomDirectory, 'packages') + @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp') + @atomNpmPath = require.resolve('npm/bin/npm-cli') +- @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp') ++ @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp') + + parseOptions: (argv) -> + options = yargs(argv).wrap(100) +--- a/src/install.coffee ++++ b/src/install.coffee +@@ -84,7 +84,7 @@ + opts = {env, cwd: @atomDirectory} + opts.streaming = true if @verbose + +- atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp') ++ atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp') + @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') -> + if code is 0 + callback()