net-misc/freerdp: drop the onoff function

diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
index 6ee72f54c147c0430705b523594e8309b96d18b1..e0e95fc01d0a6d05b685da18b8b655dd7320c968 100644 (file)
--- 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 9587efaef60c72a5ed7b15acf67f39b02f6df0b8..271191f5513f1c6ee86b5736ebb7f1f22fe0b34e 100644 (file)
--- 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
 }