commit: 65b3bc89d5e97668c0703907d370f2710723d43a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 09:48:04 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 09:50:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b3bc89
net-libs/ngtcp2: fix multilib deps for USE=ssl
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{ngtcp2-1.10.0.ebuild => ngtcp2-1.10.0-r1.ebuild} | 15 ++++++++-------
.../{ngtcp2-1.5.0.ebuild => ngtcp2-1.5.0-r1.ebuild} | 15 ++++++++-------
.../{ngtcp2-1.7.0.ebuild => ngtcp2-1.7.0-r1.ebuild} | 15 ++++++++-------
net-libs/ngtcp2/ngtcp2-9999.ebuild | 15 ++++++++-------
4 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/net-libs/ngtcp2/ngtcp2-1.10.0.ebuild
b/net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild
similarity index 85%
rename from net-libs/ngtcp2/ngtcp2-1.10.0.ebuild
rename to net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild
index 6e826067b4dc..d3a2c73278eb 100644
--- a/net-libs/ngtcp2/ngtcp2-1.10.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild
@@ -24,13 +24,14 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? (
static-libs )"
BDEPEND="virtual/pkgconfig"
RDEPEND="
ssl? (
- gnutls? ( >=net-libs/gnutls-3.7.2:0= )
- openssl? (
- >=dev-libs/openssl-1.1.1:0=
- )
- )"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+ gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
+ openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
+"
RESTRICT="!test? ( test )"
PATCHES=(
diff --git a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
b/net-libs/ngtcp2/ngtcp2-1.5.0-r1.ebuild
similarity index 84%
rename from net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
rename to net-libs/ngtcp2/ngtcp2-1.5.0-r1.ebuild
index bc6df468fc15..67d5d7bc77a8 100644
--- a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.5.0-r1.ebuild
@@ -24,13 +24,14 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? (
static-libs )"
BDEPEND="virtual/pkgconfig"
RDEPEND="
ssl? (
- gnutls? ( >=net-libs/gnutls-3.7.2:0= )
- openssl? (
- >=dev-libs/openssl-1.1.1:0=
- )
- )"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+ gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
+ openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
+"
RESTRICT="!test? ( test )"
multilib_src_configure() {
diff --git a/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild
b/net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild
similarity index 84%
rename from net-libs/ngtcp2/ngtcp2-1.7.0.ebuild
rename to net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild
index 70833ee25820..c4864da2270c 100644
--- a/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild
@@ -24,13 +24,14 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? (
static-libs )"
BDEPEND="virtual/pkgconfig"
RDEPEND="
ssl? (
- gnutls? ( >=net-libs/gnutls-3.7.2:0= )
- openssl? (
- >=dev-libs/openssl-1.1.1:0=
- )
- )"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+ gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
+ openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
+"
RESTRICT="!test? ( test )"
multilib_src_configure() {
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild
b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index 6e826067b4dc..d3a2c73278eb 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -24,13 +24,14 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? (
static-libs )"
BDEPEND="virtual/pkgconfig"
RDEPEND="
ssl? (
- gnutls? ( >=net-libs/gnutls-3.7.2:0= )
- openssl? (
- >=dev-libs/openssl-1.1.1:0=
- )
- )"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+ gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
+ openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
+"
RESTRICT="!test? ( test )"
PATCHES=(
