net-misc/freerdp: add option helper

Signed-off-by: Mike Gilbert <floppym@gentoo.org>

4 files changed, 130 insertions, 114 deletions

diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
index 97178cba90a1..febcc0e3d5c5 100644
--- a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
@@ -104,41 +104,45 @@ PATCHES=(
 	"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
 )
 
+option() {
+	usex "$1" ON OFF
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
 
 	local mycmakeargs=(
 		-Wno-dev
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DBUILD_TESTING=$(option test)
+		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_ALSA=$(option alsa)
 		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_CLIENT=$(usex client ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_ICU=$(usex icu ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_CUPS=$(option cups)
+		-DWITH_CLIENT=$(option client)
+		-DWITH_DEBUG_ALL=$(option debug)
+		-DWITH_MANPAGES=$(option doc)
+		-DWITH_FFMPEG=$(option ffmpeg)
+		-DWITH_SWSCALE=$(option ffmpeg)
+		-DWITH_CAIRO=$(option !ffmpeg)
+		-DWITH_DSP_FFMPEG=$(option ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(option gstreamer)
+		-DWITH_ICU=$(option icu)
+		-DWITH_JPEG=$(option jpeg)
+		-DWITH_GSSAPI=$(option kerberos)
+		-DWITH_NEON=$(option cpu_flags_arm_neon)
+		-DWITH_OPENH264=$(option openh264)
 		-DWITH_OSS=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)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-		-DWITH_WINPR_TOOLS=$(usex tools ON OFF)
+		-DWITH_PULSE=$(option pulseaudio)
+		-DWITH_SERVER=$(option server)
+		-DWITH_PCSC=$(option smartcard)
+		-DWITH_LIBSYSTEMD=$(option systemd)
+		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+		-DWITH_X11=$(option X)
+		-DWITH_XINERAMA=$(option xinerama)
+		-DWITH_XV=$(option xv)
+		-DWITH_WAYLAND=$(option wayland)
+		-DWITH_WINPR_TOOLS=$(option tools)
 	)
 	cmake_src_configure
 }
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index a8339e52d2c0..018ae103d0e0 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -99,41 +99,45 @@ RDEPEND="${COMMON_DEPEND}
 	tools? ( !net-misc/freerdp:3[tools] )
 "
 
+option() {
+	usex "$1" ON OFF
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
 
 	local mycmakeargs=(
 		-Wno-dev
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DBUILD_TESTING=$(option test)
+		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_ALSA=$(option alsa)
 		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_CLIENT=$(usex client ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_ICU=$(usex icu ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_CUPS=$(option cups)
+		-DWITH_CLIENT=$(option client)
+		-DWITH_DEBUG_ALL=$(option debug)
+		-DWITH_MANPAGES=$(option doc)
+		-DWITH_FFMPEG=$(option ffmpeg)
+		-DWITH_SWSCALE=$(option ffmpeg)
+		-DWITH_CAIRO=$(option !ffmpeg)
+		-DWITH_DSP_FFMPEG=$(option ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(option gstreamer)
+		-DWITH_ICU=$(option icu)
+		-DWITH_JPEG=$(option jpeg)
+		-DWITH_GSSAPI=$(option kerberos)
+		-DWITH_NEON=$(option cpu_flags_arm_neon)
+		-DWITH_OPENH264=$(option openh264)
 		-DWITH_OSS=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)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-		-DWITH_WINPR_TOOLS=$(usex tools ON OFF)
+		-DWITH_PULSE=$(option pulseaudio)
+		-DWITH_SERVER=$(option server)
+		-DWITH_PCSC=$(option smartcard)
+		-DWITH_LIBSYSTEMD=$(option systemd)
+		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+		-DWITH_X11=$(option X)
+		-DWITH_XINERAMA=$(option xinerama)
+		-DWITH_XV=$(option xv)
+		-DWITH_WAYLAND=$(option wayland)
+		-DWITH_WINPR_TOOLS=$(option tools)
 	)
 	cmake_src_configure
 }
diff --git a/net-misc/freerdp/freerdp-3.4.0-r10.ebuild b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild
index c1b674ade1f6..93c7a794de74 100644
--- a/net-misc/freerdp/freerdp-3.4.0-r10.ebuild
+++ b/net-misc/freerdp/freerdp-3.4.0-r10.ebuild
@@ -105,6 +105,10 @@ RDPEND="${COMMON_DEPEND}
 	tools? ( !net-misc/freerdp:2[tools] )
 "
 
+option() {
+	usex "$1" ON OFF
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
@@ -115,42 +119,42 @@ src_configure() {
 		# https://bugs.gentoo.org/927037
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
 
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_AAD=$(usex aad ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DBUILD_TESTING=$(option test)
+		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_AAD=$(option aad)
+		-DWITH_ALSA=$(option alsa)
 		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
-		-DWITH_CLIENT_SDL=$(usex sdl ON OFF)
+		-DWITH_CLIENT=$(option client)
+		-DWITH_CLIENT_SDL=$(option sdl)
 		-DWITH_SAMPLE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_CUPS=$(option cups)
+		-DWITH_DEBUG_ALL=$(option debug)
 		-DWITH_MANPAGES=ON
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_FFMPEG=$(option ffmpeg)
 		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_FUSE=$(usex fuse ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_KRB5=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_SWSCALE=$(option ffmpeg)
+		-DWITH_CAIRO=$(option !ffmpeg)
+		-DWITH_DSP_FFMPEG=$(option ffmpeg)
+		-DWITH_FUSE=$(option fuse)
+		-DWITH_GSTREAMER_1_0=$(option gstreamer)
+		-DWITH_JPEG=$(option jpeg)
+		-DWITH_KRB5=$(option kerberos)
+		-DWITH_NEON=$(option cpu_flags_arm_neon)
+		-DWITH_OPENH264=$(option openh264)
 		-DWITH_OSS=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_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_UNICODE_BUILTIN=$(usex icu OFF ON)
-		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
+		-DWITH_PCSC=$(option smartcard)
+		-DWITH_PKCS11=$(option smartcard)
+		-DWITH_PULSE=$(option pulseaudio)
+		-DWITH_SERVER=$(option server)
+		-DWITH_LIBSYSTEMD=$(option systemd)
+		-DWITH_UNICODE_BUILTIN=$(option !icu)
+		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+		-DWITH_X11=$(option X)
+		-DWITH_XINERAMA=$(option xinerama)
+		-DWITH_XV=$(option xv)
+		-DWITH_WAYLAND=$(option wayland)
 		-DWITH_WEBVIEW=OFF
-		-DWITH_WINPR_TOOLS=$(usex tools ON OFF)
+		-DWITH_WINPR_TOOLS=$(option tools)
 	)
 	cmake_src_configure
 }
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index c1b674ade1f6..93c7a794de74 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -105,6 +105,10 @@ RDPEND="${COMMON_DEPEND}
 	tools? ( !net-misc/freerdp:2[tools] )
 "
 
+option() {
+	usex "$1" ON OFF
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
@@ -115,42 +119,42 @@ src_configure() {
 		# https://bugs.gentoo.org/927037
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
 
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_AAD=$(usex aad ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DBUILD_TESTING=$(option test)
+		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_AAD=$(option aad)
+		-DWITH_ALSA=$(option alsa)
 		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
-		-DWITH_CLIENT_SDL=$(usex sdl ON OFF)
+		-DWITH_CLIENT=$(option client)
+		-DWITH_CLIENT_SDL=$(option sdl)
 		-DWITH_SAMPLE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_CUPS=$(option cups)
+		-DWITH_DEBUG_ALL=$(option debug)
 		-DWITH_MANPAGES=ON
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_FFMPEG=$(option ffmpeg)
 		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_FUSE=$(usex fuse ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_KRB5=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_SWSCALE=$(option ffmpeg)
+		-DWITH_CAIRO=$(option !ffmpeg)
+		-DWITH_DSP_FFMPEG=$(option ffmpeg)
+		-DWITH_FUSE=$(option fuse)
+		-DWITH_GSTREAMER_1_0=$(option gstreamer)
+		-DWITH_JPEG=$(option jpeg)
+		-DWITH_KRB5=$(option kerberos)
+		-DWITH_NEON=$(option cpu_flags_arm_neon)
+		-DWITH_OPENH264=$(option openh264)
 		-DWITH_OSS=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_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_UNICODE_BUILTIN=$(usex icu OFF ON)
-		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
+		-DWITH_PCSC=$(option smartcard)
+		-DWITH_PKCS11=$(option smartcard)
+		-DWITH_PULSE=$(option pulseaudio)
+		-DWITH_SERVER=$(option server)
+		-DWITH_LIBSYSTEMD=$(option systemd)
+		-DWITH_UNICODE_BUILTIN=$(option !icu)
+		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+		-DWITH_X11=$(option X)
+		-DWITH_XINERAMA=$(option xinerama)
+		-DWITH_XV=$(option xv)
+		-DWITH_WAYLAND=$(option wayland)
 		-DWITH_WEBVIEW=OFF
-		-DWITH_WINPR_TOOLS=$(usex tools ON OFF)
+		-DWITH_WINPR_TOOLS=$(option tools)
 	)
 	cmake_src_configure
 }