| 1 |
commit: b63cc5cbc254aaddc50edbe82d8f7dd2a510944f |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 1 22:23:15 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 1 22:23:32 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63cc5cb |
| 7 |
|
| 8 |
net-misc/freerdp: drop the onoff function |
| 9 |
|
| 10 |
net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild | 43 +++++++++++------------ |
| 11 |
net-misc/freerdp/freerdp-9999.ebuild | 43 +++++++++++------------ |
| 12 |
2 files changed, 40 insertions(+), 46 deletions(-) |
| 13 |
|
| 14 |
diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild |
| 15 |
index 6ee72f5..e0e95fc 100644 |
| 16 |
--- a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild |
| 17 |
+++ b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild |
| 18 |
@@ -86,30 +86,27 @@ DEPEND="${RDEPEND} |
| 19 |
DOCS=( README ) |
| 20 |
|
| 21 |
src_configure() { |
| 22 |
- onoff() { |
| 23 |
- usex "$1" ON OFF |
| 24 |
- } |
| 25 |
local mycmakeargs=( |
| 26 |
- -DWITH_ALSA=$(onoff alsa) |
| 27 |
- -DWITH_CLIENT=$(onoff client) |
| 28 |
- -DWITH_CUPS=$(onoff cups) |
| 29 |
- -DWITH_DEBUG_ALL=$(onoff debug) |
| 30 |
- -DWITH_MANPAGES=$(onoff doc) |
| 31 |
- -DWITH_FFMPEG=$(onoff ffmpeg) |
| 32 |
- -DWITH_GSTREAMER_1_0=$(onoff gstreamer) |
| 33 |
- -DWITH_JPEG=$(onoff jpeg) |
| 34 |
- -DWITH_NEON=$(onoff neon) |
| 35 |
- -DWITH_PULSE=$(onoff pulseaudio) |
| 36 |
- -DWITH_SERVER=$(onoff server) |
| 37 |
- -DWITH_PCSC=$(onoff smartcard) |
| 38 |
- -DWITH_LIBSYSTEMD=$(onoff systemd) |
| 39 |
- -DWITH_SSE2=$(onoff cpu_flags_x86_sse2) |
| 40 |
- -DCHANNEL_URBDRC=$(onoff usb) |
| 41 |
- -DWITH_X11=$(onoff X) |
| 42 |
- -DWITH_XINERAMA=$(onoff xinerama) |
| 43 |
- -DWITH_XV=$(onoff xv) |
| 44 |
- -DBUILD_TESTING=$(onoff test) |
| 45 |
- -DWITH_WAYLAND=$(onoff wayland) |
| 46 |
+ -DWITH_ALSA=$(usex alsa) |
| 47 |
+ -DWITH_CLIENT=$(usex client) |
| 48 |
+ -DWITH_CUPS=$(usex cups) |
| 49 |
+ -DWITH_DEBUG_ALL=$(usex debug) |
| 50 |
+ -DWITH_MANPAGES=$(usex doc) |
| 51 |
+ -DWITH_FFMPEG=$(usex ffmpeg) |
| 52 |
+ -DWITH_GSTREAMER_1_0=$(usex gstreamer) |
| 53 |
+ -DWITH_JPEG=$(usex jpeg) |
| 54 |
+ -DWITH_NEON=$(usex neon) |
| 55 |
+ -DWITH_PULSE=$(usex pulseaudio) |
| 56 |
+ -DWITH_SERVER=$(usex server) |
| 57 |
+ -DWITH_PCSC=$(usex smartcard) |
| 58 |
+ -DWITH_LIBSYSTEMD=$(usex systemd) |
| 59 |
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2) |
| 60 |
+ -DCHANNEL_URBDRC=$(usex usb) |
| 61 |
+ -DWITH_X11=$(usex X) |
| 62 |
+ -DWITH_XINERAMA=$(usex xinerama) |
| 63 |
+ -DWITH_XV=$(usex xv) |
| 64 |
+ -DBUILD_TESTING=$(usex test) |
| 65 |
+ -DWITH_WAYLAND=$(usex wayland) |
| 66 |
) |
| 67 |
cmake-utils_src_configure |
| 68 |
} |
| 69 |
|
| 70 |
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild |
| 71 |
index 9587efa..271191f 100644 |
| 72 |
--- a/net-misc/freerdp/freerdp-9999.ebuild |
| 73 |
+++ b/net-misc/freerdp/freerdp-9999.ebuild |
| 74 |
@@ -86,30 +86,27 @@ DEPEND="${RDEPEND} |
| 75 |
DOCS=( README ) |
| 76 |
|
| 77 |
src_configure() { |
| 78 |
- onoff() { |
| 79 |
- usex "$1" ON OFF |
| 80 |
- } |
| 81 |
local mycmakeargs=( |
| 82 |
- -DWITH_ALSA=$(onoff alsa) |
| 83 |
- -DWITH_CLIENT=$(onoff client) |
| 84 |
- -DWITH_CUPS=$(onoff cups) |
| 85 |
- -DWITH_DEBUG_ALL=$(onoff debug) |
| 86 |
- -DWITH_MANPAGES=$(onoff doc) |
| 87 |
- -DWITH_FFMPEG=$(onoff ffmpeg) |
| 88 |
- -DWITH_GSTREAMER_1_0=$(onoff gstreamer) |
| 89 |
- -DWITH_JPEG=$(onoff jpeg) |
| 90 |
- -DWITH_NEON=$(onoff neon) |
| 91 |
- -DWITH_PULSE=$(onoff pulseaudio) |
| 92 |
- -DWITH_SERVER=$(onoff server) |
| 93 |
- -DWITH_PCSC=$(onoff smartcard) |
| 94 |
- -DWITH_LIBSYSTEMD=$(onoff systemd) |
| 95 |
- -DWITH_SSE2=$(onoff cpu_flags_x86_sse2) |
| 96 |
- -DCHANNEL_URBDRC=$(onoff usb) |
| 97 |
- -DWITH_X11=$(onoff X) |
| 98 |
- -DWITH_XINERAMA=$(onoff xinerama) |
| 99 |
- -DWITH_XV=$(onoff xv) |
| 100 |
- -DBUILD_TESTING=$(onoff test) |
| 101 |
- -DWITH_WAYLAND=$(onoff wayland) |
| 102 |
+ -DWITH_ALSA=$(usex alsa) |
| 103 |
+ -DWITH_CLIENT=$(usex client) |
| 104 |
+ -DWITH_CUPS=$(usex cups) |
| 105 |
+ -DWITH_DEBUG_ALL=$(usex debug) |
| 106 |
+ -DWITH_MANPAGES=$(usex doc) |
| 107 |
+ -DWITH_FFMPEG=$(usex ffmpeg) |
| 108 |
+ -DWITH_GSTREAMER_1_0=$(usex gstreamer) |
| 109 |
+ -DWITH_JPEG=$(usex jpeg) |
| 110 |
+ -DWITH_NEON=$(usex neon) |
| 111 |
+ -DWITH_PULSE=$(usex pulseaudio) |
| 112 |
+ -DWITH_SERVER=$(usex server) |
| 113 |
+ -DWITH_PCSC=$(usex smartcard) |
| 114 |
+ -DWITH_LIBSYSTEMD=$(usex systemd) |
| 115 |
+ -DWITH_SSE2=$(usex cpu_flags_x86_sse2) |
| 116 |
+ -DCHANNEL_URBDRC=$(usex usb) |
| 117 |
+ -DWITH_X11=$(usex X) |
| 118 |
+ -DWITH_XINERAMA=$(usex xinerama) |
| 119 |
+ -DWITH_XV=$(usex xv) |
| 120 |
+ -DBUILD_TESTING=$(usex test) |
| 121 |
+ -DWITH_WAYLAND=$(usex wayland) |
| 122 |
) |
| 123 |
cmake-utils_src_configure |
| 124 |
} |
Archives