From b63cc5cbc254aaddc50edbe82d8f7dd2a510944f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 1 Aug 2016 18:23:15 -0400 Subject: net-misc/freerdp: drop the onoff function --- net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild | 43 +++++++++++------------ net-misc/freerdp/freerdp-9999.ebuild | 43 +++++++++++------------ 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild index 6ee72f54c147..e0e95fc01d0a 100644 --- a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild @@ -86,30 +86,27 @@ DEPEND="${RDEPEND} DOCS=( README ) src_configure() { - onoff() { - usex "$1" ON OFF - } local mycmakeargs=( - -DWITH_ALSA=$(onoff alsa) - -DWITH_CLIENT=$(onoff client) - -DWITH_CUPS=$(onoff cups) - -DWITH_DEBUG_ALL=$(onoff debug) - -DWITH_MANPAGES=$(onoff doc) - -DWITH_FFMPEG=$(onoff ffmpeg) - -DWITH_GSTREAMER_1_0=$(onoff gstreamer) - -DWITH_JPEG=$(onoff jpeg) - -DWITH_NEON=$(onoff neon) - -DWITH_PULSE=$(onoff pulseaudio) - -DWITH_SERVER=$(onoff server) - -DWITH_PCSC=$(onoff smartcard) - -DWITH_LIBSYSTEMD=$(onoff systemd) - -DWITH_SSE2=$(onoff cpu_flags_x86_sse2) - -DCHANNEL_URBDRC=$(onoff usb) - -DWITH_X11=$(onoff X) - -DWITH_XINERAMA=$(onoff xinerama) - -DWITH_XV=$(onoff xv) - -DBUILD_TESTING=$(onoff test) - -DWITH_WAYLAND=$(onoff wayland) + -DWITH_ALSA=$(usex alsa) + -DWITH_CLIENT=$(usex client) + -DWITH_CUPS=$(usex cups) + -DWITH_DEBUG_ALL=$(usex debug) + -DWITH_MANPAGES=$(usex doc) + -DWITH_FFMPEG=$(usex ffmpeg) + -DWITH_GSTREAMER_1_0=$(usex gstreamer) + -DWITH_JPEG=$(usex jpeg) + -DWITH_NEON=$(usex neon) + -DWITH_PULSE=$(usex pulseaudio) + -DWITH_SERVER=$(usex server) + -DWITH_PCSC=$(usex smartcard) + -DWITH_LIBSYSTEMD=$(usex systemd) + -DWITH_SSE2=$(usex cpu_flags_x86_sse2) + -DCHANNEL_URBDRC=$(usex usb) + -DWITH_X11=$(usex X) + -DWITH_XINERAMA=$(usex xinerama) + -DWITH_XV=$(usex xv) + -DBUILD_TESTING=$(usex test) + -DWITH_WAYLAND=$(usex wayland) ) cmake-utils_src_configure } diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 9587efaef60c..271191f5513f 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -86,30 +86,27 @@ DEPEND="${RDEPEND} DOCS=( README ) src_configure() { - onoff() { - usex "$1" ON OFF - } local mycmakeargs=( - -DWITH_ALSA=$(onoff alsa) - -DWITH_CLIENT=$(onoff client) - -DWITH_CUPS=$(onoff cups) - -DWITH_DEBUG_ALL=$(onoff debug) - -DWITH_MANPAGES=$(onoff doc) - -DWITH_FFMPEG=$(onoff ffmpeg) - -DWITH_GSTREAMER_1_0=$(onoff gstreamer) - -DWITH_JPEG=$(onoff jpeg) - -DWITH_NEON=$(onoff neon) - -DWITH_PULSE=$(onoff pulseaudio) - -DWITH_SERVER=$(onoff server) - -DWITH_PCSC=$(onoff smartcard) - -DWITH_LIBSYSTEMD=$(onoff systemd) - -DWITH_SSE2=$(onoff cpu_flags_x86_sse2) - -DCHANNEL_URBDRC=$(onoff usb) - -DWITH_X11=$(onoff X) - -DWITH_XINERAMA=$(onoff xinerama) - -DWITH_XV=$(onoff xv) - -DBUILD_TESTING=$(onoff test) - -DWITH_WAYLAND=$(onoff wayland) + -DWITH_ALSA=$(usex alsa) + -DWITH_CLIENT=$(usex client) + -DWITH_CUPS=$(usex cups) + -DWITH_DEBUG_ALL=$(usex debug) + -DWITH_MANPAGES=$(usex doc) + -DWITH_FFMPEG=$(usex ffmpeg) + -DWITH_GSTREAMER_1_0=$(usex gstreamer) + -DWITH_JPEG=$(usex jpeg) + -DWITH_NEON=$(usex neon) + -DWITH_PULSE=$(usex pulseaudio) + -DWITH_SERVER=$(usex server) + -DWITH_PCSC=$(usex smartcard) + -DWITH_LIBSYSTEMD=$(usex systemd) + -DWITH_SSE2=$(usex cpu_flags_x86_sse2) + -DCHANNEL_URBDRC=$(usex usb) + -DWITH_X11=$(usex X) + -DWITH_XINERAMA=$(usex xinerama) + -DWITH_XV=$(usex xv) + -DBUILD_TESTING=$(usex test) + -DWITH_WAYLAND=$(usex wayland) ) cmake-utils_src_configure } -- cgit v1.2.3-65-gdbad