summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2019-04-11 15:57:28 -0500
committerJory Pratt <anarchy@gentoo.org>2019-04-11 15:57:28 -0500
commit2bef09033f59a976c215a94bdf9ff7138d4a6e61 (patch)
treef564415637b051aa0a1d3a16a63473b4f89e35cb
parentnet-libs/nodejs: revert libressl changes (diff)
downloadanarchy-2bef09033f59a976c215a94bdf9ff7138d4a6e61.tar.gz
anarchy-2bef09033f59a976c215a94bdf9ff7138d4a6e61.tar.bz2
anarchy-2bef09033f59a976c215a94bdf9ff7138d4a6e61.zip
et-libs/nodejs: re-enable bundled-ssl
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r--net-libs/nodejs/Manifest4
-rw-r--r--net-libs/nodejs/metadata.xml1
-rw-r--r--net-libs/nodejs/nodejs-11.13.0.ebuild8
3 files changed, 8 insertions, 5 deletions
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a297d26..5642c31 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,5 +1,5 @@
AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
DIST node-v11.13.0.tar.xz 22085284 BLAKE2B e771c6109b4ca60b3037ec6a4f8138af75b505f35584a239f30d2a349d6de68db2f2183b89a7d5a4bbe2aef1e29fbbea54bc93697362f56c12e2e0b54fcadcd3 SHA512 89411c9b9cbf1df09cbf2b5e3a910d7ef2e4046a27a5af858c53a20f51b9ab2f9aad4e4c7c41936520e1feed249118fc46e4e4458e7980a878f364082c24fd35
-EBUILD nodejs-11.13.0.ebuild 6489 BLAKE2B 36133341b47d3a068b3e89fc1f2b0496bf2f702904e7e4e09c21e1cfeab7ae134ea87d23852b33602be1a8a8c5cfef74410bbb55740deb134993eff3caafb733 SHA512 dc2b39fa1b4833a0e0bd66af0b21cd0da6bd38a8d3bdc4ff13f4ffa2a60e3cccd557b9568aa107c4fba60e9cb33b9cf1045393cae6b9907cb369dc49815c0110
-MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
+EBUILD nodejs-11.13.0.ebuild 6547 BLAKE2B 48bd1c61b457072d9f08c7b399c62bb61c215fcbf32946dd8046ea00b1760d1090a9ae34611f29b5fc0dff3f617bd50214c4a335ed3dc4942210d4e070a9317f SHA512 eac063a0e04c63c80e1e54a22727ff354f5dee5deb2c369d557518817deba2b572fa9a3919ce2e5dce0cdb866ceb33282d6bde91e8aa0cc014da7a4a0f05269d
+MISC metadata.xml 535 BLAKE2B 1597f9da54c6fd3e01b3ff4ac7032202d9d1503b2d50530d62af530f426eb73a8f8efb5d1ebf22be71fc857b68d5733d71cebef49a1c29b5bd4205ce32d2d9d9 SHA512 85d2b15615180ccdd0a0fe4bef23ad12e7cdcaf923fba4957d7a2475cf5328e1fe034f84668d09cd608ab106ba01ecdbeb411f0e37efd37d715ef6d2025fa2a1
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index aaaba18..d7a4e51 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -5,6 +5,7 @@
<email>jer@gentoo.org</email>
</maintainer>
<use>
+ <flag name="bundled-ssl">Use bundled ssl on libressl</flag>
<flag name="inspector">Enable V8 inspector</flag>
<flag name="npm">Enable NPM package manager</flag>
<flag name="snapshot">Enable snapshot creation for faster startup</flag>
diff --git a/net-libs/nodejs/nodejs-11.13.0.ebuild b/net-libs/nodejs/nodejs-11.13.0.ebuild
index 8702b2e..7afa9e5 100644
--- a/net-libs/nodejs/nodejs-11.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-11.13.0.ebuild
@@ -15,7 +15,7 @@ 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 systemtap test"
+IUSE="bundled-ssl cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
inspector? ( icu ssl )
@@ -29,7 +29,9 @@ RDEPEND="
>=net-libs/nghttp2-1.34.0
sys-libs/zlib
icu? ( >=dev-libs/icu-63.1:= )
- ssl? ( >=dev-libs/openssl-1.1:0= )
+ ssl? (
+ !bundled-ssl? ( =dev-libs/openssl-1.1.0*:0= )
+ )
"
DEPEND="
${RDEPEND}
@@ -103,7 +105,7 @@ src_configure() {
use inspector || myconf+=( --without-inspector )
use npm || myconf+=( --without-npm )
use snapshot || myconf+=( --without-snapshot )
- use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+ use ssl && ( use bundled-ssl || myconf+=( --shared-openssl ) ) || myconf+=( --without-ssl )
local myarch=""
case ${ABI} in