commit: 54e6d659d80029fb46b334a49f6989008e56fc90
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 12:28:12 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 12:30:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e6d659
net-libs/nodejs: Obsolete.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../nodejs/files/nodejs-8.9.0-shared-nghttp2.patch | 100 ---------------------
.../nodejs/files/nodejs-9.2.0-shared-nghttp2.patch | 100 ---------------------
2 files changed, 200 deletions(-)
diff --git a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
deleted file mode 100644
index c5e0d837f30..00000000000
--- a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index 5703a70cb2d..3b6fc7347db 100755
---- a/configure
-+++ b/configure
-@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
- dest='shared_libuv_libpath',
- help='a directory to search for the shared libuv DLL')
-
-+shared_optgroup.add_option('--shared-nghttp2',
-+ action='store_true',
-+ dest='shared_nghttp2',
-+ help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+ action='store',
-+ dest='shared_nghttp2_includes',
-+ help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+ action='store',
-+ dest='shared_nghttp2_libname',
-+ default='nghttp2',
-+ help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+ action='store',
-+ dest='shared_nghttp2_libpath',
-+ help='a directory to search for the shared nghttp2 DLLs')
-+
- shared_optgroup.add_option('--shared-openssl',
- action='store_true',
- dest='shared_openssl',
-@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
- configure_library('http_parser', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
-+configure_library('nghttp2', output)
- # stay backwards compatible with shared cares builds
- output['variables']['node_shared_cares'] = \
- output['variables'].pop('node_shared_libcares')
-diff --git a/node.gyp b/node.gyp
-index 86a4331a4ed..38241302e26 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -16,6 +16,7 @@
- 'node_shared_http_parser%': 'false',
- 'node_shared_cares%': 'false',
- 'node_shared_libuv%': 'false',
-+ 'node_shared_nghttp2%': 'false',
- 'node_use_openssl%': 'true',
- 'node_shared_openssl%': 'false',
- 'node_v8_options%': '',
-@@ -177,7 +178,6 @@
-
- 'dependencies': [
- 'node_js2c#host',
-- 'deps/nghttp2/nghttp2.gyp:nghttp2'
- ],
-
- 'includes': [
-@@ -187,8 +187,7 @@
- 'include_dirs': [
- 'src',
- 'tools/msvs/genfiles',
-- '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
-- 'deps/nghttp2/lib/includes'
-+ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
- ],
-
- 'sources': [
-@@ -930,6 +929,14 @@
- 'deps/uv/uv.gyp:libuv'
- ]
- }],
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
-+ ],
-+ 'include_dirs': [
-+ 'deps/nghttp2/lib/includes'
-+ ]
-+ }],
- [ 'node_use_v8_platform=="true"', {
- 'dependencies': [
- 'deps/v8/src/v8.gyp:v8_libplatform',
-diff --git a/node.gypi b/node.gypi
-index ec78df2a339..3990c59ef98 100644
---- a/node.gypi
-+++ b/node.gypi
-@@ -259,6 +259,10 @@
- [ 'node_shared_libuv=="false"', {
- 'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
- }],
-+
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+ }],
-
- [ 'OS=="win"', {
- 'sources': [
diff --git a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
deleted file mode 100644
index e8483ab279f..00000000000
--- a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index 5703a70cb2d..3b6fc7347db 100755
---- a/configure
-+++ b/configure
-@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
- dest='shared_libuv_libpath',
- help='a directory to search for the shared libuv DLL')
-
-+shared_optgroup.add_option('--shared-nghttp2',
-+ action='store_true',
-+ dest='shared_nghttp2',
-+ help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+ action='store',
-+ dest='shared_nghttp2_includes',
-+ help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+ action='store',
-+ dest='shared_nghttp2_libname',
-+ default='nghttp2',
-+ help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+ action='store',
-+ dest='shared_nghttp2_libpath',
-+ help='a directory to search for the shared nghttp2 DLLs')
-+
- shared_optgroup.add_option('--shared-openssl',
- action='store_true',
- dest='shared_openssl',
-@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
- configure_library('http_parser', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
-+configure_library('nghttp2', output)
- # stay backwards compatible with shared cares builds
- output['variables']['node_shared_cares'] = \
- output['variables'].pop('node_shared_libcares')
-diff --git a/node.gyp b/node.gyp
-index 43a6576206d..c8ba6759246 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -16,6 +16,7 @@
- 'node_shared_http_parser%': 'false',
- 'node_shared_cares%': 'false',
- 'node_shared_libuv%': 'false',
-+ 'node_shared_nghttp2%': 'false',
- 'node_use_openssl%': 'true',
- 'node_shared_openssl%': 'false',
- 'node_v8_options%': '',
-@@ -176,7 +177,6 @@
-
- 'dependencies': [
- 'node_js2c#host',
-- 'deps/nghttp2/nghttp2.gyp:nghttp2'
- ],
-
- 'includes': [
-@@ -186,8 +186,7 @@
- 'include_dirs': [
- 'src',
- 'tools/msvs/genfiles',
-- '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
-- 'deps/nghttp2/lib/includes'
-+ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
- ],
-
- 'sources': [
-@@ -929,6 +928,14 @@
- 'deps/uv/uv.gyp:libuv'
- ]
- }],
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [
-+ 'deps/nghttp2/nghttp2.gyp:nghttp2'
-+ ],
-+ 'include_dirs': [
-+ 'deps/nghttp2/lib/includes'
-+ ]
-+ }],
- [ 'node_use_v8_platform=="true"', {
- 'dependencies': [
- 'deps/v8/src/v8.gyp:v8_libplatform',
-diff --git a/node.gypi b/node.gypi
-index ec78df2a339..3990c59ef98 100644
---- a/node.gypi
-+++ b/node.gypi
-@@ -133,6 +133,10 @@
- 'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
- }],
-
-+ [ 'node_shared_nghttp2=="false"', {
-+ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+ }],
-+
- [ 'OS=="mac"', {
- # linking Corefoundation is needed since certain OSX debugging tools
- # like Instruments require it for some features
