commit:     2522bdd5666624ca1300a3868d8989d3ea313e4f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 13:31:45 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 13:31:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2522bdd5

net-misc/freerdp: replace 'pkcs11' with 'smartcard' USE flag

Bug: https://bugs.gentoo.org/909508
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/freerdp/freerdp-9999.ebuild | 12 +++++++-----
 net-misc/freerdp/metadata.xml        |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/net-misc/freerdp/freerdp-9999.ebuild 
b/net-misc/freerdp/freerdp-9999.ebuild
index ecb074f9973c..b41c329d6872 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/";
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg 
kerberos openh264 pkcs11 pulseaudio sdl server smartcard systemd test usb 
valgrind wayland X xinerama xv"
+IUSE="aad alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg 
kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind 
wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -58,7 +58,6 @@ RDEPEND="
        jpeg? ( media-libs/libjpeg-turbo:0= )
        kerberos? ( virtual/krb5 )
        openh264? ( media-libs/openh264:0= )
-       pkcs11? ( dev-libs/pkcs11-helper )
        pulseaudio? ( media-libs/libpulse )
        sdl? (
                media-libs/libsdl2
@@ -75,7 +74,10 @@ RDEPEND="
                        xinerama? ( x11-libs/libXinerama )
                )
        )
-       smartcard? ( sys-apps/pcsc-lite )
+       smartcard? (
+               dev-libs/pkcs11-helper
+               sys-apps/pcsc-lite
+       )
        systemd? ( sys-apps/systemd:0= )
        wayland? (
                dev-libs/wayland
@@ -121,10 +123,10 @@ src_configure() {
                -DWITH_KRB5=$(usex kerberos ON OFF)
                -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
                -DWITH_OPENH264=$(usex openh264 ON OFF)
-               -DWITH_PKCS11=$(usex pkcs11 ON OFF)
+               -DWITH_PCSC=$(usex smartcard ON OFF)
+               -DWITH_PKCS11=$(usex smartcard ON OFF)
                -DWITH_PULSE=$(usex pulseaudio ON OFF)
                -DWITH_SERVER=$(usex server ON OFF)
-               -DWITH_PCSC=$(usex smartcard ON OFF)
                -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
                -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
                -DWITH_X11=$(usex X ON OFF)

diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 9714bf4a3c1f..bab72ad70c2a 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -8,7 +8,6 @@
        <use>
                <flag name="aad">Enable login via Azure AD</flag>
                <flag name="openh264">Enable H.264 support using 
<pkg>media-libs/openh264</pkg></flag>
-               <flag name="pkcs11">Enable pkcs11 for NLA smartcard logon 
support</flag>
                <flag name="server">Build server binaries</flag>
        </use>
        <upstream>

Reply via email to