From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 10 Nov 2019 13:21:36 +0000
Subject: gentoo resync : 10.11.2019
---
dev-util/scons/Manifest | 1 -
.../scons/files/scons-2.5.1-respect-path.patch | 34 ----------------------
2 files changed, 35 deletions(-)
delete mode 100644 dev-util/scons/files/scons-2.5.1-respect-path.patch
(limited to 'dev-util/scons')
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 12eba65100f6..2586f6a643b8 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,4 +1,3 @@
-AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618
AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
AUX scons-3.0.5-jdk-include-path.patch 878 BLAKE2B 7fb21bac419af3a74c6323d02082fedd80221102f87d87781bf2eafac1b877a96e11b992016b97556e24245faee85b67bfd75dcd4f5aab9b9fbdacc4c37788a1 SHA512 9cf4b31387c6630f7a6574913966cfdf355885d6f1e0c5d74951a5e69c187a768931db097e8178db0ec73201b0062a5a9c8c497cec30e9cdd6170c49610c35ff
diff --git a/dev-util/scons/files/scons-2.5.1-respect-path.patch b/dev-util/scons/files/scons-2.5.1-respect-path.patch
deleted file mode 100644
index d5da07bc980b..000000000000
--- a/dev-util/scons/files/scons-2.5.1-respect-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Clang/LLVM is installed in an "odd" location (/usr/lib/llvm/<ver>/bin/)
-which is added to PATH. Since we cannot know <ver> upfront, it's wrong
-to hardcode the PATH at the time of installation else we'd break after a
-Clang update. Since Clang is the primary compiler on Darwin, just
-extract the relevant path on each invocation.
-
---- a/engine/SCons/Platform/posix.py
-+++ b/engine/SCons/Platform/posix.py
-@@ -87,9 +87,15 @@
- pspawn = piped_env_spawn
- # Note that this means that 'escape' is no longer used
-
-+ with open('@GENTOO_PORTAGE_EPREFIX@/etc/profile.env', 'r') as f:
-+ for l in f:
-+ if "export PATH=" in l:
-+ path = l.split('=')[1].strip("'")
-+ break
-+
- if 'ENV' not in env:
- env['ENV'] = {}
-- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+ env['ENV']['PATH'] = path
- env['OBJPREFIX'] = ''
- env['OBJSUFFIX'] = '.o'
- env['SHOBJPREFIX'] = '$OBJPREFIX'
-@@ -104,7 +110,7 @@
- env['LIBSUFFIXES'] = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
- env['PSPAWN'] = pspawn
- env['SPAWN'] = spawn
-- env['SHELL'] = 'sh'
-+ env['SHELL'] = '@GENTOO_PORTAGE_EPREFIX@/bin/sh'
- env['ESCAPE'] = escape
- env['TEMPFILE'] = TempFileMunge
- env['TEMPFILEPREFIX'] = '@'
--
cgit v1.2.3