From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- net-libs/Manifest.gz | Bin 32779 -> 32791 bytes net-libs/grpc/Manifest | 12 +- .../files/grpc-1.21.0-fix-host-ar-handling.patch | 47 ----- ...grpc-1.22.0-cxx_arg_list_too_long_forloop.patch | 44 ----- .../grpc/files/grpc-1.25.0-pkgconfig-libdir.patch | 17 -- .../grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch | 53 ----- .../grpc/files/use-pkg-config-to-find-re2.patch | 26 +++ net-libs/grpc/grpc-1.26.0-r1.ebuild | 114 ----------- net-libs/grpc/grpc-1.32.0.ebuild | 87 +++++++++ net-libs/grpc/metadata.xml | 4 - net-libs/libblkmaker/Manifest | 8 - net-libs/libblkmaker/libblkmaker-0.4.2.ebuild | 25 --- net-libs/libblkmaker/libblkmaker-0.5.0.ebuild | 25 --- net-libs/libblkmaker/libblkmaker-0.5.1.ebuild | 25 --- net-libs/libblkmaker/libblkmaker-0.5.2.ebuild | 25 --- net-libs/libbloom/Manifest | 3 +- net-libs/libbloom/libbloom-1.5-r1.ebuild | 27 --- net-libs/libbloom/libbloom-1.6.ebuild | 30 +++ net-libs/libgadu/Manifest | 2 +- net-libs/libgadu/libgadu-1.11.4.ebuild | 24 +-- net-libs/libmbim/Manifest | 8 - net-libs/libmbim/libmbim-1.10.0.ebuild | 44 ----- net-libs/libmbim/libmbim-1.12.2.ebuild | 44 ----- net-libs/libmbim/libmbim-1.12.4.ebuild | 44 ----- net-libs/libmbim/libmbim-1.6.0.ebuild | 46 ----- net-libs/libnma/Manifest | 2 +- net-libs/libnma/libnma-1.8.30.ebuild | 2 +- net-libs/libsearpc/Manifest | 2 +- net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild | 4 +- net-libs/libssh/Manifest | 2 +- net-libs/libssh/libssh-0.9.5.ebuild | 2 +- net-libs/nodejs/Manifest | 18 +- net-libs/nodejs/nodejs-12.18.3.ebuild | 213 -------------------- net-libs/nodejs/nodejs-12.18.4-r1.ebuild | 215 +++++++++++++++++++++ net-libs/nodejs/nodejs-12.18.4.ebuild | 213 -------------------- net-libs/nodejs/nodejs-14.10.0.ebuild | 200 ------------------- net-libs/nodejs/nodejs-14.10.1.ebuild | 200 ------------------- net-libs/nodejs/nodejs-14.11.0.ebuild | 2 +- net-libs/nodejs/nodejs-14.13.0-r1.ebuild | 205 ++++++++++++++++++++ net-libs/nodejs/nodejs-14.8.0.ebuild | 200 ------------------- net-libs/nodejs/nodejs-14.9.0.ebuild | 200 ------------------- net-libs/nodejs/nodejs-99999999.ebuild | 11 +- net-libs/serf/Manifest | 2 +- net-libs/serf/serf-1.3.9-r2.ebuild | 2 +- 44 files changed, 597 insertions(+), 1882 deletions(-) delete mode 100644 net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch delete mode 100644 net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch delete mode 100644 net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch delete mode 100644 net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch create mode 100644 net-libs/grpc/files/use-pkg-config-to-find-re2.patch delete mode 100644 net-libs/grpc/grpc-1.26.0-r1.ebuild create mode 100644 net-libs/grpc/grpc-1.32.0.ebuild delete mode 100644 net-libs/libblkmaker/libblkmaker-0.4.2.ebuild delete mode 100644 net-libs/libblkmaker/libblkmaker-0.5.0.ebuild delete mode 100644 net-libs/libblkmaker/libblkmaker-0.5.1.ebuild delete mode 100644 net-libs/libblkmaker/libblkmaker-0.5.2.ebuild delete mode 100644 net-libs/libbloom/libbloom-1.5-r1.ebuild create mode 100644 net-libs/libbloom/libbloom-1.6.ebuild delete mode 100644 net-libs/libmbim/libmbim-1.10.0.ebuild delete mode 100644 net-libs/libmbim/libmbim-1.12.2.ebuild delete mode 100644 net-libs/libmbim/libmbim-1.12.4.ebuild delete mode 100644 net-libs/libmbim/libmbim-1.6.0.ebuild delete mode 100644 net-libs/nodejs/nodejs-12.18.3.ebuild create mode 100644 net-libs/nodejs/nodejs-12.18.4-r1.ebuild delete mode 100644 net-libs/nodejs/nodejs-12.18.4.ebuild delete mode 100644 net-libs/nodejs/nodejs-14.10.0.ebuild delete mode 100644 net-libs/nodejs/nodejs-14.10.1.ebuild create mode 100644 net-libs/nodejs/nodejs-14.13.0-r1.ebuild delete mode 100644 net-libs/nodejs/nodejs-14.8.0.ebuild delete mode 100644 net-libs/nodejs/nodejs-14.9.0.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 23bb4da995ca..9b852e6dbc17 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 3682c2b465c9..b8fef70f76ed 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,10 +1,6 @@ -AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493 -AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5 -AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a -AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be -DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61 -DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb +AUX use-pkg-config-to-find-re2.patch 730 BLAKE2B fb37a761c6aaf2ff00f3e9a6b791c58981ab9b5f16723a2057b83989fefc89496e9fa3d52260e221ba22142b7cd33d468fe4a63291308a0c7e8fcfbddfe3cdc7 SHA512 152ca478820d56065193cc47caedc00db17b069246f646546dc6e9ebb5d9023248ca6fc7a816bf2efd7a19e59309a1f0f6f4c508d80487b47e1e98734ecadf09 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b -EBUILD grpc-1.26.0-r1.ebuild 2685 BLAKE2B d2b51dc050788e587b9e0b631db41f0706cc1f0366b44bf5492fa6131fa8bac0866340cb60a6f83c7356e99a9faacc7174c49681a24bd8b3f0f38ac10c11c8c9 SHA512 95bde11e513f1ffe08969c8a50e8354ce41423fd08f7f659ba2024defe2311caa0878a7aebc1d421b77e1ae1ff48ed0e41b3df7aa42518765e20b5f31275d618 +DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed EBUILD grpc-1.28.1-r1.ebuild 1649 BLAKE2B feee01d962a31f7942b7673b9464f88542553ab8a4159cfac58e7158271979b13931d82cf19a7346d75b952637e16abc763904f4de239f44c4738ec67919c5b0 SHA512 533987b156f6dbd7f69c0eee45fd24de0f59ccd8babdcd0467d424137536a86afcb62584c3e6314e91f4e413c49f65faf9833f4940419b4bc5498016a0bc9e89 -MISC metadata.xml 630 BLAKE2B 1798e243492198d1a5df8cd8928ce592e243bdac8d68cf7089af016b0c7579d8e89ca90f81cda221a33d60f224d51e93b4cdb1464f8ed64cfefd3e1dccc695ef SHA512 f7c2aa3e76f18e30872d2ee9154290509b7d946d388bbf767505dfdb87dce9716b19cdbf53f2fc72dfcb79cc809b843b2660b6828682aa9f887cfba8c623fd93 +EBUILD grpc-1.32.0.ebuild 1992 BLAKE2B d2d96a96e7b15e260c293ccbf91f9d146c29c7ed7e8051fe56f25fa9a3d1dcbd822c07b3868428b6a0bac76ac06347fb02590526801ea18b41aec06e94119efe SHA512 a77974e64742d830f1c26050c287efdadc625679eb2a758959652ac209b6ccefc56a2cb58ac70f91f755de110255ce464ad2e0290682dd8da95cb5b6f4e6e9cb +MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe diff --git a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch deleted file mode 100644 index 213a39a38438..000000000000 --- a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Wed, 22 May 2019 23:04:28 -0700 -Subject: [PATCH] Makefile: fix host ar handling - -picked lines from -https://github.com/grpc/grpc/pull/11476 ---- - Makefile | 236 ++++++++++++++++++++++++++++--------------------------- - 1 file changed, 119 insertions(+), 117 deletions(-) - -diff --git a/Makefile b/Makefile -index 67495f2..e1c741c 100644 ---- a/Makefile -+++ b/Makefile -@@ -346,6 +346,7 @@ HOST_CC ?= $(CC) - HOST_CXX ?= $(CXX) - HOST_LD ?= $(LD) - HOST_LDXX ?= $(LDXX) -+HOST_AR ?= $(AR) - - CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI) - CXXFLAGS += -std=c++11 -@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS) - HOST_CXXFLAGS += $(CXXFLAGS) - HOST_LDFLAGS += $(LDFLAGS) - HOST_LDLIBS += $(LDLIBS) -+HOST_AROPTS = $(AROPTS) - - # These are automatically computed variables. - # There shouldn't be any need to change anything from now on. - -@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error - - else - --$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) -- $(E) "[AR] Creating $@" -+$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) -+ $(E) "[HOSTAR] Creating $@" - $(Q) mkdir -p `dirname $@` - $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a -- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) -+ $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) - ifeq ($(SYSTEM),Darwin) - $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a - endif diff --git a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch deleted file mode 100644 index 974d6fcc4351..000000000000 --- a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/Makefile 2018-06-26 11:07:45.948160976 +0200 -+++ b/Makefile 2019-06-26 11:04:25.798966336 +0200 -@@ -2820,13 +2820,15 @@ - - install-headers_c: - $(E) "[INSTALL] Installing public C headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_C); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-headers_cxx: - $(E) "[INSTALL] Installing public C++ headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-static: install-static_c install-static_cxx - ---- a/templates/Makefile.template 2019-06-26 12:38:36.777292299 +0200 -+++ b/templates/Makefile.template 2019-06-26 12:48:35.668550020 +0200 -@@ -1302,13 +1302,15 @@ - - install-headers_c: - $(E) "[INSTALL] Installing public C headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_C); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-headers_cxx: - $(E) "[INSTALL] Installing public C++ headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-static: install-static_c install-static_cxx - diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch deleted file mode 100644 index 28088713e5f8..000000000000 --- a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Makefile 2018-05-28 17:59:34.631540261 +0800 -+++ b/Makefile 2018-05-28 18:01:31.266936000 +0800 -@@ -460,11 +460,11 @@ - CACHE_MK += HAS_PKG_CONFIG = true, - endif - --CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) -+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) - --CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) -+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) - --CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) -+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) - - ifeq ($(SYSTEM),MINGW32) - EXECUTABLE_SUFFIX = .exe diff --git a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch deleted file mode 100644 index d18063f2ef1b..000000000000 --- a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001 -From: Chirantan Ekbote -Date: Mon, 10 Jul 2017 13:26:04 -0700 -Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig - -It doesn't make sense to run ldconfig for a staged install. Remove it. ---- - Makefile | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/Makefile b/Makefile -index 86bd66a5e0..f4c2a5bcb9 100644 ---- a/Makefile -+++ b/Makefile -@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3 - $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so - endif --ifneq ($(SYSTEM),MINGW32) --ifneq ($(SYSTEM),Darwin) -- $(Q) ldconfig || true --endif --endif - - - install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx -@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so - endif --ifneq ($(SYSTEM),MINGW32) --ifneq ($(SYSTEM),Darwin) -- $(Q) ldconfig || true --endif --endif - - - install-shared_csharp: shared_csharp strip-shared_csharp -@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so - endif --ifneq ($(SYSTEM),MINGW32) --ifneq ($(SYSTEM),Darwin) -- $(Q) ldconfig || true --endif --endif - - - install-plugins: $(PROTOC_PLUGINS) --- -2.14.0.rc0.284.gd933b75aa4-goog - diff --git a/net-libs/grpc/files/use-pkg-config-to-find-re2.patch b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch new file mode 100644 index 000000000000..33712d62ef01 --- /dev/null +++ b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch @@ -0,0 +1,26 @@ +From 1f51d47b0ab2c0ac54c27b54f5e8e79910138a02 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 25 Sep 2020 15:10:26 -0700 +Subject: [PATCH] use pkg-config to find re2 + +--- + cmake/re2.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/re2.cmake b/cmake/re2.cmake +index 3e83aae..94dfa5d 100644 +--- a/cmake/re2.cmake ++++ b/cmake/re2.cmake +@@ -45,7 +45,8 @@ if(gRPC_RE2_PROVIDER STREQUAL "module") + set(gRPC_INSTALL FALSE) + endif() + elseif(gRPC_RE2_PROVIDER STREQUAL "package") +- find_package(re2 REQUIRED CONFIG) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(RE2 REQUIRED re2) + + if(TARGET re2::re2) + set(_gRPC_RE2_LIBRARIES re2::re2) +-- +2.28.0 + diff --git a/net-libs/grpc/grpc-1.26.0-r1.ebuild b/net-libs/grpc/grpc-1.26.0-r1.ebuild deleted file mode 100644 index d9352892adf1..000000000000 --- a/net-libs/grpc/grpc-1.26.0-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -MY_PV="${PV//_pre/-pre}" - -DESCRIPTION="Modern open source high performance RPC framework" -HOMEPAGE="https://www.grpc.io" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~gyakovlev/distfiles/grpc-1.26-fix-odr-violation.patch.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="examples doc perftools systemtap static-libs" - -DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - >=dev-libs/protobuf-3.8.0:= - >=net-dns/c-ares-1.15.0:= - sys-libs/zlib:= - perftools? ( dev-util/google-perftools:= ) - systemtap? ( dev-util/systemtap ) -" - -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -# requires network -RESTRICT="test" - -PATCHES=( - "${WORKDIR}/grpc-1.26-fix-odr-violation.patch" #705574 - "${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch" - "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch" - "${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844 -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - rm -r third_party/cares || die - sed -i 's:-Werror::g' Makefile || die - sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" - - default -} - -src_compile() { - tc-export CC CXX PKG_CONFIG - - local myemakeargs=( - V=1 - prefix=/usr - INSTALL_LIBDIR="$(get_libdir)" - AR="$(tc-getAR)" - AROPTS="rcs" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LD="${CC}" - LDXX="${CXX}" - STRIP=/bin/true - HOST_AR="$(tc-getBUILD_AR)" - HOST_CC="$(tc-getBUILD_CC)" - HOST_CXX="$(tc-getBUILD_CXX)" - HOST_LD="$(tc-getBUILD_CC)" - HOST_LDXX="$(tc-getBUILD_CXX)" - HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" - HAS_SYSTEMTAP="$(usex systemtap true false)" - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - local myemakeargs=( - V=1 - prefix="${ED}"/usr - INSTALL_LIBDIR="$(get_libdir)" - STRIP=/bin/true - ) - - emake "${myemakeargs[@]}" install - - use static-libs || find "${ED}" -name '*.a' -delete - - if use examples; then - find examples -name '.gitignore' -delete || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - if use doc; then - find doc -name '.gitignore' -delete || die - local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) - fi - - einstalldocs -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 1.16.0; then - ewarn "python bindings and tools moved to separate independent packages" - ewarn "check dev-python/grpcio and dev-python/grpcio-tools" - fi - done - -} diff --git a/net-libs/grpc/grpc-1.32.0.ebuild b/net-libs/grpc/grpc-1.32.0.ebuild new file mode 100644 index 000000000000..e76d53897806 --- /dev/null +++ b/net-libs/grpc/grpc-1.32.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_PV="${PV//_pre/-pre}" + +DESCRIPTION="Modern open source high performance RPC framework" +HOMEPAGE="https://www.grpc.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="doc examples libressl test" + +RDEPEND=" + =dev-cpp/abseil-cpp-20200225*:= + dev-libs/re2:= + >=dev-libs/protobuf-3.13.0:= + >=net-dns/c-ares-1.15.0:= + sys-libs/zlib:= + !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) +" + +DEPEND="${RDEPEND} + test? ( + dev-cpp/benchmark + dev-cpp/gflags + ) +" + +BDEPEND="virtual/pkgconfig" + +# requires sources of many google tools +RESTRICT="test" + +S="${WORKDIR}/${PN}-${MY_PV}" + +PATCHES=( "${FILESDIR}/use-pkg-config-to-find-re2.patch" ) + +src_prepare() { + cmake_src_prepare + + # un-hardcode libdir + sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die + sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die +} + +src_configure() { + local mycmakeargs=( + -DgRPC_INSTALL=ON + -DgRPC_ABSL_PROVIDER=package + -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF + -DgRPC_CARES_PROVIDER=package + -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}" + -DgRPC_INSTALL_LIBDIR="$(get_libdir)" + -DgRPC_PROTOBUF_PROVIDER=package + -DgRPC_RE2_PROVIDER=package + -DgRPC_SSL_PROVIDER=package + -DgRPC_ZLIB_PROVIDER=package + -DgRPC_BUILD_TESTS=$(usex test) + $(usex test '-DgRPC_GFLAGS_PROVIDER=package' '') + $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + + if use doc; then + find doc -name '.gitignore' -delete || die + local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) + fi + + einstalldocs +} diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml index 708220c8696a..08613524f7f3 100644 --- a/net-libs/grpc/metadata.xml +++ b/net-libs/grpc/metadata.xml @@ -8,10 +8,6 @@ gyakovlev@gentoo.org Georgy Yakovlev - - Enable profiling using dev-util/google-perftools - Enable SystemTAP/DTrace tracing - cpe:/a:grpc:grpc grpc/grpc diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest index 99f80443ddfa..db22859a8635 100644 --- a/net-libs/libblkmaker/Manifest +++ b/net-libs/libblkmaker/Manifest @@ -1,15 +1,7 @@ DIST libblkmaker-0.3.2.tgz 17893 BLAKE2B 390ed56c7d77b904ec52d52cfa9dfff4e5c01c1662e0f5a5f17f92eb7b3d79619bd6ee64cfa28bbff5750db7cbc31d1cd5662b11a86ef63882063ddcb72cfb6b SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf -DIST libblkmaker-0.4.2-github.tgz 13708 BLAKE2B b49fc4bf6c125c0f642fb1a8643f284369ef9195cad46818a2114eca38e68d36dbcfadda0a15a8da17732f1aa2f81c3d2cf079a8d11ce6c80a1bf53543c91013 SHA512 b5ac42ed1be14b10a93828c3c34f1d176d9128a8cb263bda1a55cd5c9d7157f8b501a3943ee60705f572aae7bec7098a9353032499457dbbec80c105796a95cf DIST libblkmaker-0.4.3-github.tgz 13712 BLAKE2B 4c93b8a74d25b5833371e2db78062f35c726b6ac89b8b22420a61d15a1d37cf0784b001e7061da4274ed34691021d5e92a27ce04260621cfdac6b4c7c49ce69f SHA512 a8686fc0cd757a214e24476c2fc8bac4511e6522ba977134150c0084dd2a3d7620f3378f4c454dcefb675840b71597f37d5b696a74ad0251b5d3921082c23285 -DIST libblkmaker-0.5.0-github.tgz 13577 BLAKE2B 54badd25f08ef3518b2a083e0527e17a85dc16498e7d7235a84259d9d6c9d9402ef6e684617946cdd6db9572966a8937ade4424d8ee03d45dbe886bc4affcdfd SHA512 64f90a652485f8c192a0d1e6184e44a0d4372907954f0abd855973099436f87a1c02a0ee383b86b22825427c7df5f46b06a9be9c55747942281cd6fc0e1aa33a -DIST libblkmaker-0.5.1-github.tgz 13655 BLAKE2B 0854fb33030078f631c095c59e38a878d03820a32697baee9cb871ce0298682cb2d28e445c49fe491f8e616cdb9c2d59a975545b14d0ec6fc992d15cb4361d71 SHA512 45dd0638b3d1188131d9104a86230f87910fcde225198f4d23cc69f31fc1a86077d83a89780a9ddf686dd286bcbfcb59e1a94f4dfe4e6397236a76bef50f9b14 -DIST libblkmaker-0.5.2-github.tgz 13657 BLAKE2B ab1719232741a24322b34db5909768aa628afb93a9703eabbb4105d02379e522174778fff49bb1b90e35871d6c8d48b6dc3cf64d3c738337e7fd5ae768ddbce4 SHA512 ea3f3d2779d126c4ac55ba5bdf38dc0766559bb56609e0116e3221dd0ea058a2195c8f7b17d4d7611bb764044e79bc238130f8628f189e1f1169db11badbc824 DIST libblkmaker-0.5.3-github.tgz 14161 BLAKE2B c8da4f7e3e2811cc88a03537ceb2e145ba3bb796520f4330d190e5935c13b73769cba73612d321f5c63b636bbd821e334b5a72ab893bd765edbcf49ce374f789 SHA512 57edcd583879d6abea716b6817a99dc345485392d149ddc6bb2ff9bac76d22f84cd960dc0746852e7c944a10b85d26c57fb107eac79680f77829c9bbc03c202d EBUILD libblkmaker-0.3.2.ebuild 539 BLAKE2B f82f0c021d3a6dcd6ecc7cd777c26d51a7dfc712a0e96b27caaae7d144379ce0050e84d91a55dcc35d32de8206eff3b65e99b711c5728711445ba1333276f2c6 SHA512 422a503f2b0d561f06d690f66803dbd6fae22d7413d3d08730e7e640ee266dba9dc5748a23ea254e221194e3882d879610129c144028e1d90e9a1923a2fb5c89 -EBUILD libblkmaker-0.4.2.ebuild 567 BLAKE2B 56c871b286f29d66df9adad39c1172eabc0d063997ea36092c62e6ef1830e5e5171fecccedea3a47b5770d2d57679be5161ac5869848bef207e56cd0a7a3ea0d SHA512 55aca7bb92f51a8d61be76e73dd7a54f7efc2568ea5c8793569b3161343eecdfedfb9f4bb26e354c46018430ea00c4578fae92cd27771ab4840c7a86004e986e EBUILD libblkmaker-0.4.3.ebuild 514 BLAKE2B b33abfa6b7cebd3af366855219d01ad6ab281e4bb4ba557c428d988594136f0a4f6c24296648e5a2ef51a55bb5b5b9ab03e5a7a2ead6b8686376eddc419de9d2 SHA512 60099192c78c29f4972d7dad77ddbf2452c4089df11a802a6fd1dd7531e4da4895f7218567bd7d15b950efef0db82160088a8de1a6afb6eb747324282045d615 -EBUILD libblkmaker-0.5.0.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e -EBUILD libblkmaker-0.5.1.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e -EBUILD libblkmaker-0.5.2.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e EBUILD libblkmaker-0.5.3.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e MISC metadata.xml 458 BLAKE2B 6b0af9ae636522bc685b709e618ccf90343d3639211c2cd660de7f32934e04d672f0202c239dfcf91b10a27189a3f26694471007f7ad73adbfa5f1bf7a85af7c SHA512 55bf903c89e214eb664da1995053dbfc0dfd896c1cda51ec7ba38c0f8bcc20e9aa4142702c201ac57aec1a132ceb338c8137deaad9c8502e275ca517a63eebab diff --git a/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild deleted file mode 100644 index a4e0edb41baf..000000000000 --- a/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="C implementation of getblocktemplate (BIP 22)" -HOMEPAGE="https://gitorious.org/bitcoin/libblkmaker" -HOMEPAGE="https://github.com/bitcoin/libblkmaker" -LICENSE="MIT" - -SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND=" - >=dev-libs/jansson-2.0.0 -" -RDEPEND="${DEPEND} - ! "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node " -} diff --git a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild new file mode 100644 index 000000000000..8b94d6f307b4 --- /dev/null +++ b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="threads(+)" +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +SRC_URI=" + https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz +" + +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" +REQUIRED_USE=" + inspector? ( icu ssl ) + npm? ( ssl ) + system-ssl? ( ssl ) +" + +RDEPEND=" + >=app-arch/brotli-1.0.7 + >=dev-libs/libuv-1.39.0:= + >=net-dns/c-ares-1.16.0 + >=net-libs/http-parser-2.9.3:= + >=net-libs/nghttp2-1.40.0 + sys-libs/zlib + icu? ( >=dev-libs/icu-64.2:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +BDEPEND=" + ${PYTHON_DEPS} + systemtap? ( dev-util/systemtap ) + test? ( net-misc/curl ) +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch + "${FILESDIR}"/${PN}-99999999-llhttp.patch +) +RESTRICT="test" +S="${WORKDIR}/node-v${PV}" + +pkg_pretend() { + (use x86 && ! use cpu_flags_x86_sse2) && \ + die "Your CPU doesn't support the required SSE2 instruction." + + ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ + die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." +} + +src_prepare() { + tc-export CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # Avoid a test that I've only been able to reproduce from emerge. It doesnt + # seem sandbox related either (invoking it from a sandbox works fine). + # The issue is that no stdin handle is openened when asked for one. + # It doesn't really belong upstream , so it'll just be removed until someone + # with more gentoo-knowledge than me (jbergstroem) figures it out. + rm test/parallel/test-stdout-close-unref.js || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + default +} + +src_configure() { + xdg_environment_reset + + local myconf=( + --shared-brotli + --shared-cares + --shared-http-parser + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case ${ABI} in + amd64) myarch="x64";; + arm) myarch="arm";; + arm64) myarch="arm64";; + ppc64) myarch="ppc64";; + x32) myarch="x32";; + x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + $(use_with systemtap dtrace) \ + "${myconf[@]}" || die +} + +src_compile() { + emake -C out mksnapshot + pax-mark m "out/${BUILDTYPE}/mksnapshot" + emake -C out +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + dodir /etc/npm + + # Install bash completion for `npm` + # We need to temporarily replace default config path since + # npm otherwise tries to write outside of the sandbox + local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" + sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die + local tmp_npm_completion_file="$(emktemp)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + out/${BUILDTYPE}/cctest || die + "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die +} + +pkg_postinst() { + elog "The global npm config lives in /etc/npm. This deviates slightly" + elog "from upstream which otherwise would have it live in /usr/etc/." + elog "" + elog "Protip: When using node-gyp to install native modules, you can" + elog "avoid having to download extras by doing the following:" + elog "$ node-gyp --nodedir /usr/include/node " +} diff --git a/net-libs/nodejs/nodejs-12.18.4.ebuild b/net-libs/nodejs/nodejs-12.18.4.ebuild deleted file mode 100644 index af217c2f69dc..000000000000 --- a/net-libs/nodejs/nodejs-12.18.4.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 - >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-99999999-llhttp.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares - --shared-http-parser - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node " -} diff --git a/net-libs/nodejs/nodejs-14.10.0.ebuild b/net-libs/nodejs/nodejs-14.10.0.ebuild deleted file mode 100644 index 43b934166628..000000000000 --- a/net-libs/nodejs/nodejs-14.10.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 - >=net-libs/nghttp2-1.41.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-14.10.1.ebuild b/net-libs/nodejs/nodejs-14.10.1.ebuild deleted file mode 100644 index 43b934166628..000000000000 --- a/net-libs/nodejs/nodejs-14.10.1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 - >=net-libs/nghttp2-1.41.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-14.11.0.ebuild b/net-libs/nodejs/nodejs-14.11.0.ebuild index 43b934166628..a1b0b0547ebe 100644 --- a/net-libs/nodejs/nodejs-14.11.0.ebuild +++ b/net-libs/nodejs/nodejs-14.11.0.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/nodejs/nodejs-14.13.0-r1.ebuild b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild new file mode 100644 index 000000000000..1b229989974f --- /dev/null +++ b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="threads(+)" +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +SRC_URI=" + https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz +" + +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" +REQUIRED_USE=" + inspector? ( icu ssl ) + npm? ( ssl ) + system-ssl? ( ssl ) +" + +RDEPEND=" + >=app-arch/brotli-1.0.9 + >=dev-libs/libuv-1.40.0:= + >=net-dns/c-ares-1.16.1 + >=net-libs/nghttp2-1.41.0 + sys-libs/zlib + icu? ( >=dev-libs/icu-67:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +BDEPEND=" + ${PYTHON_DEPS} + systemtap? ( dev-util/systemtap ) + test? ( net-misc/curl ) + pax_kernel? ( sys-apps/elfix ) +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch +) +RESTRICT="test" +S="${WORKDIR}/node-v${PV}" + +pkg_pretend() { + (use x86 && ! use cpu_flags_x86_sse2) && \ + die "Your CPU doesn't support the required SSE2 instruction." + + ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ + die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # Avoid a test that I've only been able to reproduce from emerge. It doesnt + # seem sandbox related either (invoking it from a sandbox works fine). + # The issue is that no stdin handle is openened when asked for one. + # It doesn't really belong upstream , so it'll just be removed until someone + # with more gentoo-knowledge than me (jbergstroem) figures it out. + rm test/parallel/test-stdout-close-unref.js || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + local myconf=( + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case ${ABI} in + amd64) myarch="x64";; + arm) myarch="arm";; + arm64) myarch="arm64";; + ppc64) myarch="ppc64";; + x32) myarch="x32";; + x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + $(use_with systemtap dtrace) \ + "${myconf[@]}" || die +} + +src_compile() { + emake -C out +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + dodir /etc/npm + + # Install bash completion for `npm` + # We need to temporarily replace default config path since + # npm otherwise tries to write outside of the sandbox + local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" + sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die + local tmp_npm_completion_file="$(emktemp)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die +} diff --git a/net-libs/nodejs/nodejs-14.8.0.ebuild b/net-libs/nodejs/nodejs-14.8.0.ebuild deleted file mode 100644 index 9d912667e480..000000000000 --- a/net-libs/nodejs/nodejs-14.8.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.38.1:= - >=net-dns/c-ares-1.16.0 - >=net-libs/nghttp2-1.41.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-14.9.0.ebuild b/net-libs/nodejs/nodejs-14.9.0.ebuild deleted file mode 100644 index 43b934166628..000000000000 --- a/net-libs/nodejs/nodejs-14.9.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) - system-ssl? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 - >=net-libs/nghttp2-1.41.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 70e923f68c04..87f5c52bddd6 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -22,8 +22,9 @@ REQUIRED_USE=" " RDEPEND=" - >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 + >=app-arch/brotli-1.0.9 + >=dev-libs/libuv-1.40.0:= + >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) @@ -95,7 +96,11 @@ src_configure() { xdg_environment_reset local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib ) use debug && myconf+=( --debug ) use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest index 52097e7770a5..717b5dfba0d2 100644 --- a/net-libs/serf/Manifest +++ b/net-libs/serf/Manifest @@ -5,5 +5,5 @@ AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d EBUILD serf-1.3.9-r1.ebuild 2054 BLAKE2B 6f7d698e7e77eda30d0725d1ac55662ef69262e4d2599e2b74a867911c6b24deb29dce5a82eb75d53a2e8be52c62c0e03ef09ff40d27a1f3808a7a9aac8e9cac SHA512 ca6e8e60e6c587e35fdeffe0d231db79354f929b79953633cc4348d1b16fb3f4dacf5f5ce49ce6f19f31d8e87b4a112dcd56e9ea53e66ce6a2c5288352bdd334 -EBUILD serf-1.3.9-r2.ebuild 2098 BLAKE2B 8d021addc53e079fb4a455b68a3bf4145ed8c22834a9ccf84605f72c1067bd71594aa0b73c01fd33c6c853f9cd37d75108e702284946be0a7608c5d561798d61 SHA512 2fe5da265fc64a140935a349e6dcf530c80f108205d29056de422142c15cf524b5f3e7d4c1779a56945dd8e449fda57857cc7a136aa31786e932bf3e2a553ed8 +EBUILD serf-1.3.9-r2.ebuild 2096 BLAKE2B b789d66135b7449549b838cadc11aed704b89892268f4d83b661cb08a13a2e322430097504c41cf8d5cffefb3227bb24f1eceea83151dd35a033a7c597025536 SHA512 1f5cdaa4c6a13270119ff94a14b25e6e7288299ada259135c09bcc9a7a7421248e22f1bdd44a858954112917453789ec27b6cda28be5cf717f84c75d00052f9e MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877 diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild index a39a528e3e76..e0703ec15916 100644 --- a/net-libs/serf/serf-1.3.9-r2.ebuild +++ b/net-libs/serf/serf-1.3.9-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" IUSE="kerberos static-libs libressl" RESTRICT="test" -- cgit v1.2.3