Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/
Date: Sun, 10 May 2020 18:22:21
Message-Id: 1589134923.4bddaa176ca59cf71ac733b1b2fd9ee7837d02bf.floppym@gentoo
1 commit: 4bddaa176ca59cf71ac733b1b2fd9ee7837d02bf
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 10 18:22:03 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun May 10 18:22:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bddaa17
7
8 net-misc/freerdp: remove 'client' USE flag
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 net-misc/freerdp/freerdp-2.1.0.ebuild | 35 ++++++++++++++++-------------------
13 net-misc/freerdp/freerdp-9999.ebuild | 35 ++++++++++++++++-------------------
14 2 files changed, 32 insertions(+), 38 deletions(-)
15
16 diff --git a/net-misc/freerdp/freerdp-2.1.0.ebuild b/net-misc/freerdp/freerdp-2.1.0.ebuild
17 index 06bba1d6eaa..105a638ec62 100644
18 --- a/net-misc/freerdp/freerdp-2.1.0.ebuild
19 +++ b/net-misc/freerdp/freerdp-2.1.0.ebuild
20 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
21
22 LICENSE="Apache-2.0"
23 SLOT="0/2"
24 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
25 +IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
26 RESTRICT="!test? ( test )"
27
28 RDEPEND="
29 @@ -32,21 +32,19 @@ RDEPEND="
30 sys-libs/zlib:0
31 alsa? ( media-libs/alsa-lib )
32 cups? ( net-print/cups )
33 - client? (
34 - usb? (
35 - virtual/libudev:0=
36 - sys-apps/util-linux:0=
37 - dev-libs/dbus-glib:0=
38 - virtual/libusb:1=
39 - )
40 - X? (
41 - x11-libs/libXcursor
42 - x11-libs/libXext
43 - x11-libs/libXi
44 - x11-libs/libXrender
45 - xinerama? ( x11-libs/libXinerama )
46 - xv? ( x11-libs/libXv )
47 - )
48 + usb? (
49 + virtual/libudev:0=
50 + sys-apps/util-linux:0=
51 + dev-libs/dbus-glib:0=
52 + virtual/libusb:1=
53 + )
54 + X? (
55 + x11-libs/libXcursor
56 + x11-libs/libXext
57 + x11-libs/libXi
58 + x11-libs/libXrender
59 + xinerama? ( x11-libs/libXinerama )
60 + xv? ( x11-libs/libXv )
61 )
62 ffmpeg? ( media-video/ffmpeg:0= )
63 !ffmpeg? (
64 @@ -85,10 +83,10 @@ RDEPEND="
65 DEPEND="${RDEPEND}"
66 BDEPEND="
67 virtual/pkgconfig
68 - client? ( X? ( doc? (
69 + X? ( doc? (
70 app-text/docbook-xml-dtd:4.1.2
71 app-text/xmlto
72 - ) ) )
73 + ) )
74 "
75
76 src_configure() {
77 @@ -97,7 +95,6 @@ src_configure() {
78 -DCHANNEL_URBDRC=$(usex usb ON OFF)
79 -DWITH_ALSA=$(usex alsa ON OFF)
80 -DWITH_CCACHE=OFF
81 - -DWITH_CLIENT=$(usex client ON OFF)
82 -DWITH_CUPS=$(usex cups ON OFF)
83 -DWITH_DEBUG_ALL=$(usex debug ON OFF)
84 -DWITH_MANPAGES=$(usex doc ON OFF)
85
86 diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
87 index b541ab6af7c..fa7d73ce5c8 100644
88 --- a/net-misc/freerdp/freerdp-9999.ebuild
89 +++ b/net-misc/freerdp/freerdp-9999.ebuild
90 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
91
92 LICENSE="Apache-2.0"
93 SLOT="0/2"
94 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
95 +IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
96 RESTRICT="!test? ( test )"
97
98 RDEPEND="
99 @@ -32,21 +32,19 @@ RDEPEND="
100 sys-libs/zlib:0
101 alsa? ( media-libs/alsa-lib )
102 cups? ( net-print/cups )
103 - client? (
104 - usb? (
105 - virtual/libudev:0=
106 - sys-apps/util-linux:0=
107 - dev-libs/dbus-glib:0=
108 - virtual/libusb:1=
109 - )
110 - X? (
111 - x11-libs/libXcursor
112 - x11-libs/libXext
113 - x11-libs/libXi
114 - x11-libs/libXrender
115 - xinerama? ( x11-libs/libXinerama )
116 - xv? ( x11-libs/libXv )
117 - )
118 + usb? (
119 + virtual/libudev:0=
120 + sys-apps/util-linux:0=
121 + dev-libs/dbus-glib:0=
122 + virtual/libusb:1=
123 + )
124 + X? (
125 + x11-libs/libXcursor
126 + x11-libs/libXext
127 + x11-libs/libXi
128 + x11-libs/libXrender
129 + xinerama? ( x11-libs/libXinerama )
130 + xv? ( x11-libs/libXv )
131 )
132 ffmpeg? ( media-video/ffmpeg:0= )
133 !ffmpeg? (
134 @@ -85,10 +83,10 @@ RDEPEND="
135 DEPEND="${RDEPEND}"
136 BDEPEND="
137 virtual/pkgconfig
138 - client? ( X? ( doc? (
139 + X? ( doc? (
140 app-text/docbook-xml-dtd:4.1.2
141 app-text/xmlto
142 - ) ) )
143 + ) )
144 "
145
146 src_configure() {
147 @@ -97,7 +95,6 @@ src_configure() {
148 -DCHANNEL_URBDRC=$(usex usb ON OFF)
149 -DWITH_ALSA=$(usex alsa ON OFF)
150 -DWITH_CCACHE=OFF
151 - -DWITH_CLIENT=$(usex client ON OFF)
152 -DWITH_CUPS=$(usex cups ON OFF)
153 -DWITH_DEBUG_ALL=$(usex debug ON OFF)
154 -DWITH_MANPAGES=$(usex doc ON OFF)