[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/

[Mike Gilbert]

commit:     b2476045e8e305ba09aa24cfe3d4f45fda9c1a9b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 22:01:56 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 22:21:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2476045

net-misc/freerdp: convert to EAPI 6

 net-misc/freerdp/freerdp-9999.ebuild | 52 +++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/net-misc/freerdp/freerdp-9999.ebuild 
b/net-misc/freerdp/freerdp-9999.ebuild
index a173223..0ca0957 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
-inherit cmake-utils vcs-snapshot
+inherit cmake-utils
 
-if [[ ${PV} != 9999* ]]; then
+if [[ ${PV} != 9999 ]]; then
+       inherit vcs-snapshot
        COMMIT=""
        SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
@@ -85,27 +86,30 @@ DEPEND="${RDEPEND}
 DOCS=( README )
 
 src_configure() {
+       onoff() {
+               usex "$1" ON OFF
+       }
        local mycmakeargs=(
-               $(cmake-utils_use_with alsa ALSA)
-               $(cmake-utils_use_with client CLIENT)
-               $(cmake-utils_use_with cups CUPS)
-               $(cmake-utils_use_with debug DEBUG_ALL)
-               $(cmake-utils_use_with doc MANPAGES)
-               $(cmake-utils_use_with ffmpeg FFMPEG)
-               $(cmake-utils_use_with gstreamer GSTREAMER_1_0)
-               $(cmake-utils_use_with jpeg JPEG)
-               $(cmake-utils_use_with neon NEON)
-               $(cmake-utils_use_with pulseaudio PULSE)
-               $(cmake-utils_use_with server SERVER)
-               $(cmake-utils_use_with smartcard PCSC)
-               $(cmake-utils_use_with systemd LIBSYSTEMD)
-               $(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-               $(cmake-utils_use usb CHANNEL_URBDRC)
-               $(cmake-utils_use_with X X11)
-               $(cmake-utils_use_with xinerama XINERAMA)
-               $(cmake-utils_use_with xv XV)
-               $(cmake-utils_use_build test TESTING)
-               $(cmake-utils_use_with wayland WAYLAND)
+               -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)
        )
        cmake-utils_src_configure
 }