summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2022-04-11 08:31:15 -0400
committerMike Gilbert <floppym@gentoo.org>2022-04-11 08:31:52 -0400
commit9f2dd4cbd17dd7b0b35a119713706645b25d7752 (patch)
tree619b9346465aa08a0eda50eae2f9ad33fea57564 /net-vpn
parentwww-client/firefox: drop 91.7.0, 91.7.1 (sec cleanup) (diff)
downloadgentoo-9f2dd4cbd17dd7b0b35a119713706645b25d7752.tar.gz
gentoo-9f2dd4cbd17dd7b0b35a119713706645b25d7752.tar.bz2
gentoo-9f2dd4cbd17dd7b0b35a119713706645b25d7752.zip
net-vpn/openconnect: fix test deps
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-vpn')
-rw-r--r--net-vpn/openconnect/openconnect-8.20.ebuild21
-rw-r--r--net-vpn/openconnect/openconnect-9999.ebuild21
2 files changed, 20 insertions, 22 deletions
diff --git a/net-vpn/openconnect/openconnect-8.20.ebuild b/net-vpn/openconnect/openconnect-8.20.ebuild
index ba5c1e11f3b9..005edaf647c5 100644
--- a/net-vpn/openconnect/openconnect-8.20.ebuild
+++ b/net-vpn/openconnect/openconnect-8.20.ebuild
@@ -24,17 +24,13 @@ SLOT="0/5"
IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test"
RESTRICT="!test? ( test )"
-DEPEND="
+COMMON_DEPEND="
dev-libs/libxml2
sys-libs/zlib
app-crypt/p11-kit
!gnutls? (
>=dev-libs/openssl-1.0.1h:0=
dev-libs/libp11
- test? ( || (
- >=dev-libs/openssl-1.1.0:0[weak-ssl-ciphers(-)]
- <dev-libs/openssl-1.1.0:0
- ) )
)
gnutls? (
app-crypt/trousers
@@ -52,7 +48,14 @@ DEPEND="
smartcard? ( sys-apps/pcsc-lite:0= )
stoken? ( app-crypt/stoken )
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ test? (
+ net-libs/socket_wrapper
+ sys-libs/uid_wrapper
+ !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] )
+ )
+"
+RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2
>=net-vpn/vpnc-scripts-20210402-r1
selinux? ( sec-policy/selinux-vpn )
@@ -61,11 +64,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( ${PYTHON_DEPS} sys-apps/groff )
nls? ( sys-devel/gettext )
- test? (
- net-libs/socket_wrapper
- net-vpn/ocserv
- sys-libs/uid_wrapper
- )
+ test? ( net-vpn/ocserv )
"
CONFIG_CHECK="~TUN"
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 95f5dc14d1e6..90982f02608c 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -24,17 +24,13 @@ SLOT="0/5"
IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test"
RESTRICT="!test? ( test )"
-DEPEND="
+COMMON_DEPEND="
dev-libs/libxml2
sys-libs/zlib
app-crypt/p11-kit
!gnutls? (
>=dev-libs/openssl-1.0.1h:0=
dev-libs/libp11
- test? ( || (
- >=dev-libs/openssl-1.1.0:0[weak-ssl-ciphers(-)]
- <dev-libs/openssl-1.1.0:0
- ) )
)
gnutls? (
app-crypt/trousers
@@ -52,7 +48,14 @@ DEPEND="
smartcard? ( sys-apps/pcsc-lite:0= )
stoken? ( app-crypt/stoken )
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ test? (
+ net-libs/socket_wrapper
+ sys-libs/uid_wrapper
+ !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] )
+ )
+"
+RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2
>=net-vpn/vpnc-scripts-20210402-r1
selinux? ( sec-policy/selinux-vpn )
@@ -61,11 +64,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( ${PYTHON_DEPS} sys-apps/groff )
nls? ( sys-devel/gettext )
- test? (
- net-libs/socket_wrapper
- net-vpn/ocserv
- sys-libs/uid_wrapper
- )
+ test? ( net-vpn/ocserv )
"
CONFIG_CHECK="~TUN"