commit: e928dfb16726420de9838fac83fdf93d45270e50
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 17:44:30 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 17:44:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e928dfb1
net-vpn/openconnect: fix automagic deps on p11-kit and libpskc
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-vpn/openconnect/metadata.xml | 1 +
.../{openconnect-8.10-r5.ebuild => openconnect-8.10-r6.ebuild} | 6 +++++-
net-vpn/openconnect/openconnect-9999.ebuild | 6 +++++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/net-vpn/openconnect/metadata.xml b/net-vpn/openconnect/metadata.xml
index 41262f103fd..0660a620fe5 100644
--- a/net-vpn/openconnect/metadata.xml
+++ b/net-vpn/openconnect/metadata.xml
@@ -12,6 +12,7 @@
<use>
<flag name="gssapi">Build GSSAPI support</flag>
<flag name="libproxy">Enable proxy support</flag>
+ <flag name="pskc">Enable PSKC file storage of HOTP/TOTP
keys</flag>
<flag name="stoken">Enable stoken support</flag>
</use>
</pkgmetadata>
diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild
b/net-vpn/openconnect/openconnect-8.10-r6.ebuild
similarity index 94%
rename from net-vpn/openconnect/openconnect-8.10-r5.ebuild
rename to net-vpn/openconnect/openconnect-8.10-r6.ebuild
index d8210a2b00a..da0988a8a8f 100644
--- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild
+++ b/net-vpn/openconnect/openconnect-8.10-r6.ebuild
@@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html";
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test"
RESTRICT="!test? ( test )"
DEPEND="
dev-libs/libxml2
sys-libs/zlib
+ app-crypt/p11-kit
!gnutls? (
>=dev-libs/openssl-1.0.1h:0=
+ dev-libs/libp11
)
gnutls? (
app-crypt/trousers
@@ -42,6 +44,7 @@ DEPEND="
libproxy? ( net-libs/libproxy )
lz4? ( app-arch/lz4:= )
nls? ( virtual/libintl )
+ pskc? ( sys-auth/oath-toolkit[pskc] )
smartcard? ( sys-apps/pcsc-lite:0= )
stoken? ( app-crypt/stoken )
"
@@ -103,6 +106,7 @@ src_configure() {
$(use_with libproxy)
$(use_with lz4)
$(use_with gssapi)
+ $(use_with pskc libpskc)
$(use_with smartcard libpcsclite)
$(use_with stoken)
--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild
b/net-vpn/openconnect/openconnect-9999.ebuild
index b2332da693e..5a6a3065e1d 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html";
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test"
RESTRICT="!test? ( test )"
DEPEND="
dev-libs/libxml2
sys-libs/zlib
+ app-crypt/p11-kit
!gnutls? (
>=dev-libs/openssl-1.0.1h:0=
+ dev-libs/libp11
)
gnutls? (
app-crypt/trousers
@@ -42,6 +44,7 @@ DEPEND="
libproxy? ( net-libs/libproxy )
lz4? ( app-arch/lz4:= )
nls? ( virtual/libintl )
+ pskc? ( sys-auth/oath-toolkit[pskc] )
smartcard? ( sys-apps/pcsc-lite:0= )
stoken? ( app-crypt/stoken )
"
@@ -103,6 +106,7 @@ src_configure() {
$(use_with libproxy)
$(use_with lz4)
$(use_with gssapi)
+ $(use_with pskc libpskc)
$(use_with smartcard libpcsclite)
$(use_with stoken)
--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
