net-libs/nodejs: Revert dev-libs/openssl-1.1* dep change

With openssl-1.1.1a I see lots and lots of test failures that I do not see with
1.1.0* -- these reflect actual errors in using crypto functions.

While there, resolve an implicit dependency on net-dns/c-ares that was
missed in the 8, 9, 10 and 11 branch version bumps.

Fixes: 64bc534bf4412e0088839c628ff79fa456ae60bb
Bug: https://bugs.gentoo.org/670574
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

5 files changed, 10 insertions, 6 deletions

diff --git a/net-libs/nodejs/nodejs-10.13.0.ebuild b/net-libs/nodejs/nodejs-10.13.0.ebuild
index 48b92009eacf..ea37a260ff52 100644
--- a/net-libs/nodejs/nodejs-10.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.13.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-62.1:= )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/nodejs/nodejs-11.2.0.ebuild b/net-libs/nodejs/nodejs-11.2.0.ebuild
index 460e9934c1c9..0f0eca94f047 100644
--- a/net-libs/nodejs/nodejs-11.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-11.2.0.ebuild
@@ -24,11 +24,12 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-63.1:= )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
+	ssl? ( =dev-libs/openssl-1.1.0*:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -92,7 +93,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	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 )
diff --git a/net-libs/nodejs/nodejs-8.13.0.ebuild b/net-libs/nodejs/nodejs-8.13.0.ebuild
index 83633326efcb..9c86a46c7a65 100644
--- a/net-libs/nodejs/nodejs-8.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-8.13.0.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.23.2:=
+	>=net-dns/c-ares-1.10.1
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.33.0
 	sys-libs/zlib
@@ -97,7 +98,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	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 )
diff --git a/net-libs/nodejs/nodejs-9.11.2.ebuild b/net-libs/nodejs/nodejs-9.11.2.ebuild
index 449755ba98b5..c38803a05bea 100644
--- a/net-libs/nodejs/nodejs-9.11.2.ebuild
+++ b/net-libs/nodejs/nodejs-9.11.2.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.19.2:=
+	>=net-dns/c-ares-1.13.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.32.0
 	sys-libs/zlib
@@ -92,7 +93,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	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 )
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index ed175f32b8cb..50cfd8981c83 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -23,6 +23,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.19.2:=
+	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
@@ -91,7 +92,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	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 )