gentoo resync : 14.07.2018

9 files changed, 0 insertions, 285 deletions

diff --git a/app-editors/atom/files/apm-python.patch b/app-editors/atom/files/apm-python.patch
deleted file mode 100644
index 0467beaf10ee..000000000000
--- a/app-editors/atom/files/apm-python.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/apm/bin/python-interceptor.sh b/apm/bin/python-interceptor.sh
-index 7ce1965..12cc72f 100755
---- a/apm/bin/python-interceptor.sh
-+++ b/apm/bin/python-interceptor.sh
-@@ -34,9 +34,9 @@ case $1 in
-       ARGS+=("--format=safemake.py")
-     fi
- 
--    exec python "${ARGS[@]}"
-+    exec python2 "${ARGS[@]}"
-     ;;
-   *)
--    exec python "$@"
-+    exec python2 "$@"
-     ;;
- esac
diff --git a/app-editors/atom/files/atom-apm-path-r2.patch b/app-editors/atom/files/atom-apm-path-r2.patch
deleted file mode 100644
index 12234b6bab13..000000000000
--- a/app-editors/atom/files/atom-apm-path-r2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/config-schema.js b/src/config-schema.js
-index 39f0585..24ee2de 100644
---- a/src/config-schema.js
-+++ b/src/config-schema.js
-@@ -5,6 +5,11 @@ const configSchema = {
-   core: {
-     type: 'object',
-     properties: {
-+      apmPath: {
-+        type: 'string',
-+        "default": '{{ATOM_PREFIX}}/usr/bin/apm{{ATOM_SUFFIX}}',
-+        description: 'Path to apm executable.'
-+      },
-       ignoredNames: {
-         type: 'array',
-         default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
diff --git a/app-editors/atom/files/atom-fix-app-restart-r1.patch b/app-editors/atom/files/atom-fix-app-restart-r1.patch
deleted file mode 100644
index f984d7841be9..000000000000
--- a/app-editors/atom/files/atom-fix-app-restart-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/atom-application.js.orig b/atom-application.js
-index 92d985f..9a120e6 100644
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -1178,6 +1178,7 @@
-     AtomApplication.prototype.restart = function() {
-       var args;
-       args = [];
-+      args.push("--app=" + this.resourcePath);
-       if (this.safeMode) {
-         args.push("--safe");
-       }
diff --git a/app-editors/atom/files/atom-license-path-r1.patch b/app-editors/atom/files/atom-license-path-r1.patch
deleted file mode 100644
index c8d6ab9784f0..000000000000
--- a/app-editors/atom/files/atom-license-path-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -406,7 +406,7 @@
-       this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap');
-       this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets');
-       this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet');
--      this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'));
-+      this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md');
-       this.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) {
-         return function(event) {
-           if (!_this.quitting) {
diff --git a/app-editors/atom/files/atom-marker-layer-r1.patch b/app-editors/atom/files/atom-marker-layer-r1.patch
deleted file mode 100644
index 1dcdecbd4eba..000000000000
--- a/app-editors/atom/files/atom-marker-layer-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/node_modules/text-buffer/lib/marker-layer.js
---- b/node_modules/text-buffer/lib/marker-layer.js
-@@ -192,7 +192,7 @@
-         return function(markerId) {
-           var marker;
-           marker = _this.markersById[markerId];
--          if (!marker.matchesParams(params)) {
-+          if (marker == null || !marker.matchesParams(params)) {
-             return;
-           }
-           return result.push(marker);
diff --git a/app-editors/atom/files/atom-python.patch b/app-editors/atom/files/atom-python.patch
deleted file mode 100644
index 57a475ecce02..000000000000
--- a/app-editors/atom/files/atom-python.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/atom.sh
-+++ b/atom.sh
-@@ -92,6 +92,7 @@
-   fi
- 
-   ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-+  export PYTHON=python2
-   mkdir -p "$ATOM_HOME"
- 
-   : ${TMPDIR:=/tmp}
diff --git a/app-editors/atom/files/atom-unbundle-electron-r1.patch b/app-editors/atom/files/atom-unbundle-electron-r1.patch
deleted file mode 100644
index 85c0c64ab794..000000000000
--- a/app-editors/atom/files/atom-unbundle-electron-r1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 27 Jul 2017 13:18:54 -0400
-Subject: [PATCH] Unbundle electron
-
----
- atom.sh | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/atom.sh b/atom.sh
-index 6b0e94430..ea8e0dc2e 100755
---- a/atom.sh
-+++ b/atom.sh
-@@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then
-   SCRIPT=$(readlink -f "$0")
-   USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
- 
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
--  else
--    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
--  fi
-+  export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
-+  export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
-+  export LOCAL_GIT_DIRECTORY="{{ATOM_PREFIX}}/usr"
-+  ATOM_PATH="{{ATOM_PATH}}"
- 
-   ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-   mkdir -p "$ATOM_HOME"
-@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then
-   [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
- 
-   if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+    "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-     exit $?
-   else
-     (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+    nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-     if [ $? -ne 0 ]; then
-       cat "$ATOM_HOME/nohup.out"
-       exit $?
--- 
-2.13.3
diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py
deleted file mode 100644
index 370221380b64..000000000000
--- a/app-editors/atom/files/gyp-unbundle.py
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env python2
-
-from __future__ import print_function
-
-
-import argparse
-import pprint
-import sys
-
-
-def die(msg):
-    print(msg, file=sys.stderr)
-    sys.exit(1)
-
-
-def do_unbundle(gypdata, targets):
-    gyptargets = {t['target_name']: t for t in gypdata['targets']}
-    dropped_deps = set()
-
-    def _unbundle_in_block(gypblock):
-        gypdeps = gypblock.get('dependencies') or {}
-
-        for dep, (libs, defines) in unbundlings.items():
-            if dep not in gypdeps:
-                continue
-
-            gypdeps.remove(dep)
-
-            try:
-                ls = gyptarget['link_settings']
-            except KeyError:
-                ls = gyptarget['link_settings'] = {}
-
-            try:
-                gyplibs = ls['libraries']
-            except KeyError:
-                gyplibs = ls['libraries'] = []
-
-            gyplibs.extend('-l{}'.format(lib) for lib in libs)
-
-            if defines:
-                try:
-                    dd = gyptarget['defines']
-                except KeyError:
-                    dd = gyptarget['defines'] = []
-
-                dd.extend(defines)
-
-            dropped_deps.add(dep)
-
-        gypconds = gypblock.get('conditions') or []
-        for cond in gypconds:
-            condblocks = cond[1:]
-            for condblock in condblocks:
-                _unbundle_in_block(condblock)
-
-    for target, unbundlings in targets.items():
-        if target not in gyptargets:
-            die('There is no {} target in gyp file'.format(target))
-
-        gyptarget = gyptargets[target]
-
-        _unbundle_in_block(gyptarget)
-
-    for gyptarget in gypdata['targets']:
-        if gyptarget['target_name'] in dropped_deps:
-            if gyptarget.get('dependencies'):
-                dropped_deps.update(gyptarget.get('dependencies'))
-
-    new_targets = []
-    for gyptarget in gypdata['targets']:
-        if gyptarget['target_name'] not in dropped_deps:
-            new_targets.append(gyptarget)
-
-    gypdata['targets'] = new_targets
-
-    gypconds = gypdata.get('conditions')
-    if gypconds:
-        for cond in gypconds:
-            condblocks = cond[1:]
-            for condblock in condblocks:
-                new_targets = []
-                blocktargets = condblock.get('targets')
-                if blocktargets:
-                    for blocktarget in blocktargets:
-                        if blocktarget['target_name'] not in dropped_deps:
-                            new_targets.append(blocktarget)
-                    condblock['targets'] = new_targets
-
-
-def main():
-    parser = argparse.ArgumentParser(description='Unbundle libs in gyp files')
-    parser.add_argument('gypfile', type=str, help='input gyp file')
-    parser.add_argument(
-        '--unbundle', type=str, action='append',
-        help='unbundle rule in the format '
-             '<target>;<dep>;<lib>[;lib][;-DMACRO]')
-    parser.add_argument(
-        '-i', '--inplace', action='store_true',
-        help='modify gyp file in-place')
-
-    args = parser.parse_args()
-
-    targets = {}
-
-    for unbundle in args.unbundle:
-        rule = list(filter(None, (i.strip() for i in unbundle.split(';'))))
-        if len(rule) < 3:
-            die('Invalid unbundle rule: {!r}'.format(unbundle))
-        target, dep = rule[:2]
-
-        defines = []
-        libs = []
-
-        for item in rule[2:]:
-            if item.startswith('-D'):
-                defines.append(item[2:])
-            else:
-                libs.append(item)
-
-        try:
-            target_unbundlings = targets[target]
-        except KeyError:
-            target_unbundlings = targets[target] = {}
-
-        target_unbundlings[dep] = libs, defines
-
-    with open(args.gypfile, 'rt') as f:
-        gypdata = eval(f.read())
-
-    do_unbundle(gypdata, targets)
-
-    if args.inplace:
-        with open(args.gypfile, 'wt') as f:
-            pprint.pprint(gypdata, stream=f)
-    else:
-        pprint.pprint(gypdata)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/app-editors/atom/files/transpile-coffee-script.js b/app-editors/atom/files/transpile-coffee-script.js
deleted file mode 100644
index c32e09cad92d..000000000000
--- a/app-editors/atom/files/transpile-coffee-script.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict'
-
-const CompileCache = require(process.env.ATOM_SRC_ROOT + '/src/compile-cache')
-const fs = require('fs')
-const glob = require('glob')
-const path = require('path')
-
-module.exports = function () {
-  let paths = new Set()
-
-  for (let pattern of process.argv.slice(2)) {
-    for (let path of glob.sync(pattern, {nodir: true})) {
-      paths.add(path)
-    }
-  }
-
-  for (let path of paths) {
-    let jsPath = coffeePath.replace(/coffee$/g, 'js')
-    fs.writeFileSync(
-      jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME))
-    fs.unlinkSync(coffeePath)
-  }
-}