Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-input-wacom/files/, x11-drivers/xf86-input-wacom/
Date: Sun, 20 Jan 2019 05:43:21
Message-Id: 1547962985.e0afeb07eaa642f0508dec429c124fba008da07f.mattst88@gentoo
1 commit: e0afeb07eaa642f0508dec429c124fba008da07f
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 20 05:28:14 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 20 05:43:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0afeb07
7
8 x11-drivers/xf86-input-wacom: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-drivers/xf86-input-wacom/Manifest | 2 -
13 ...put-wacom-0.34.0-xorg-server-1.19-support.patch | 49 --------------
14 .../xf86-input-wacom-0.34.0.ebuild | 77 ----------------------
15 .../xf86-input-wacom-0.35.0.ebuild | 73 --------------------
16 .../xf86-input-wacom-0.36.0.ebuild | 73 --------------------
17 5 files changed, 274 deletions(-)
18
19 diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
20 index ab7988b64c4..4b3259e7a1f 100644
21 --- a/x11-drivers/xf86-input-wacom/Manifest
22 +++ b/x11-drivers/xf86-input-wacom/Manifest
23 @@ -1,3 +1 @@
24 -DIST xf86-input-wacom-0.34.0.tar.bz2 598624 BLAKE2B 9b8b39f859a007c89ff1eb24711a2cc6a90b3106b8a3ceb2bc3c7064c14c5079e8ab08e248309ab08716da5c2e593046dd78b3d989167762c794af95b85ae95f SHA512 d0aae70853f73d989d168e054bb21ddbd2114ec6c012b1c5f949838bb20a7fe75711211886dd649ec0e9449d199da17b4ff156d5d672ad02c8b2e0b667cc40ad
25 -DIST xf86-input-wacom-0.35.0.tar.bz2 601314 BLAKE2B 59c2b03b79d141b71583ce3ea6ac4957e345322b67e78f24333a3f045316aa878dbcca6a575f7daf490e2991494215d83bf28bb9ec6b8a8c133abc57d559dc44 SHA512 9586348e8da91651bc9a9ee9e74dd77f4311060538dcb228681b98300f7624401878190322dcbc4e798bd1eeeb7d2900abc3f5e949a583b6cda44821b8821058
26 DIST xf86-input-wacom-0.36.0.tar.bz2 611678 BLAKE2B b3fc8310514e6e07c3c25fceeb982d66e9e10730028af769cd331578a48720666a0872b625beb15c7f68bbb291293dfe4c4e305411310c67bb2bd148e7d570d8 SHA512 48e4cf945eb0f5c7c65d46153756372bbfd6d1f101cd90f609c71cc21b36fa671d98c7be0b52d519775c7e7b875ec441d4308cf70d7897198600553e7a93ccc5
27
28 diff --git a/x11-drivers/xf86-input-wacom/files/xf86-input-wacom-0.34.0-xorg-server-1.19-support.patch b/x11-drivers/xf86-input-wacom/files/xf86-input-wacom-0.34.0-xorg-server-1.19-support.patch
29 deleted file mode 100644
30 index 3c1494d3605..00000000000
31 --- a/x11-drivers/xf86-input-wacom/files/xf86-input-wacom-0.34.0-xorg-server-1.19-support.patch
32 +++ /dev/null
33 @@ -1,49 +0,0 @@
34 -From f0dedf7a610ac97bc45738492b98ce4f1e0514ec Mon Sep 17 00:00:00 2001
35 -From: Jason Gerecke <killertofu@×××××.com>
36 -Date: Wed, 18 Jan 2017 09:00:10 -0800
37 -Subject: [PATCH] tests: Fix compilation under ABI 25 and greater
38 -
39 -The X server recently deprecated xf86BlockSIGIO and xf86UnblockSIGIO and
40 -simultaneously defined them inline within xf86.h. The new inline definition
41 -causes problems both because fake-symbols.c will end up redefining them,
42 -and because the function bodies reference a symbol that does not get included
43 -when building the tests. To fix these errors, update fake-symbols.c with
44 -updated include guards and a definition of the undefined symbols.
45 -
46 -Signed-off-by: Jason Gerecke <jason.gerecke@×××××.com>
47 -Reviewed-by: Peter Hutterer <peter.hutterer@×××××.net>
48 ----
49 - test/fake-symbols.c | 10 ++++++++++
50 - 1 file changed, 10 insertions(+)
51 -
52 -diff --git a/test/fake-symbols.c b/test/fake-symbols.c
53 -index 6f2c10a..e649fb9 100644
54 ---- a/test/fake-symbols.c
55 -+++ b/test/fake-symbols.c
56 -@@ -493,6 +493,7 @@ void TimerFree(OsTimerPtr timer)
57 - {
58 - }
59 -
60 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 24
61 - int
62 - xf86BlockSIGIO (void)
63 - {
64 -@@ -503,6 +504,15 @@ void
65 - xf86UnblockSIGIO (int wasset)
66 - {
67 - }
68 -+#else
69 -+void input_lock (void)
70 -+{
71 -+}
72 -+
73 -+void input_unlock (void)
74 -+{
75 -+}
76 -+#endif
77 -
78 - /* This is not the same as the X server one, but it'll do for the tests */
79 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
80 ---
81 -2.10.2
82 -
83
84 diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild
85 deleted file mode 100644
86 index cd427a34041..00000000000
87 --- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild
88 +++ /dev/null
89 @@ -1,77 +0,0 @@
90 -# Copyright 1999-2018 Gentoo Foundation
91 -# Distributed under the terms of the GNU General Public License v2
92 -
93 -EAPI=5
94 -
95 -inherit linux-info xorg-2
96 -
97 -DESCRIPTION="Driver for Wacom tablets and drawing devices"
98 -HOMEPAGE="http://linuxwacom.sourceforge.net/"
99 -LICENSE="GPL-2"
100 -EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
101 -[[ ${PV} != 9999* ]] && \
102 - SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
103 -
104 -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
105 -IUSE="debug"
106 -
107 -# depend on libwacom for its udev rules, bug #389633
108 -RDEPEND="dev-libs/libwacom
109 - virtual/udev
110 - >=x11-base/xorg-server-1.7
111 - x11-libs/libX11
112 - x11-libs/libXext
113 - x11-libs/libXi
114 - x11-libs/libXrandr
115 - x11-libs/libXinerama"
116 -DEPEND="${RDEPEND}
117 - x11-base/xorg-proto"
118 -
119 -PATCHES=(
120 - "${FILESDIR}/${P}-xorg-server-1.19-support.patch"
121 -)
122 -
123 -pkg_setup() {
124 - linux-info_pkg_setup
125 -
126 - XORG_CONFIGURE_OPTIONS=(
127 - $(use_enable debug)
128 - )
129 -}
130 -
131 -src_install() {
132 - xorg-2_src_install
133 -
134 - rm -rf "${ED}"/usr/share/hal
135 -}
136 -
137 -pkg_pretend() {
138 - linux-info_pkg_setup
139 -
140 - if kernel_is lt 3 17; then
141 - if ! linux_config_exists \
142 - || ! linux_chkconfig_present TABLET_USB_WACOM \
143 - || ! linux_chkconfig_present INPUT_EVDEV; then
144 - echo
145 - ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
146 - ewarn " Device Drivers --->"
147 - ewarn " Input device support --->"
148 - ewarn " <*> Event interface"
149 - ewarn " [*] Tablets --->"
150 - ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
151 - echo
152 - fi
153 - else
154 - if ! linux_config_exists \
155 - || ! linux_chkconfig_present HID_WACOM; then
156 - echo
157 - ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
158 - ewarn " Device Drivers --->"
159 - ewarn " HID support --->"
160 - ewarn " Special HID drivers --->"
161 - ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
162 - echo
163 - fi
164 - fi
165 -
166 -}
167
168 diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild
169 deleted file mode 100644
170 index 0f91507ed82..00000000000
171 --- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild
172 +++ /dev/null
173 @@ -1,73 +0,0 @@
174 -# Copyright 1999-2018 Gentoo Foundation
175 -# Distributed under the terms of the GNU General Public License v2
176 -
177 -EAPI=5
178 -
179 -inherit linux-info xorg-2
180 -
181 -DESCRIPTION="Driver for Wacom tablets and drawing devices"
182 -HOMEPAGE="http://linuxwacom.sourceforge.net/"
183 -LICENSE="GPL-2"
184 -EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
185 -[[ ${PV} != 9999* ]] && \
186 - SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
187 -
188 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
189 -IUSE="debug"
190 -
191 -# depend on libwacom for its udev rules, bug #389633
192 -RDEPEND="dev-libs/libwacom
193 - virtual/udev
194 - >=x11-base/xorg-server-1.7
195 - x11-libs/libX11
196 - x11-libs/libXext
197 - x11-libs/libXi
198 - x11-libs/libXrandr
199 - x11-libs/libXinerama"
200 -DEPEND="${RDEPEND}
201 - x11-base/xorg-proto"
202 -
203 -pkg_setup() {
204 - linux-info_pkg_setup
205 -
206 - XORG_CONFIGURE_OPTIONS=(
207 - $(use_enable debug)
208 - )
209 -}
210 -
211 -src_install() {
212 - xorg-2_src_install
213 -
214 - rm -rf "${ED}"/usr/share/hal
215 -}
216 -
217 -pkg_pretend() {
218 - linux-info_pkg_setup
219 -
220 - if kernel_is lt 3 17; then
221 - if ! linux_config_exists \
222 - || ! linux_chkconfig_present TABLET_USB_WACOM \
223 - || ! linux_chkconfig_present INPUT_EVDEV; then
224 - echo
225 - ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
226 - ewarn " Device Drivers --->"
227 - ewarn " Input device support --->"
228 - ewarn " <*> Event interface"
229 - ewarn " [*] Tablets --->"
230 - ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
231 - echo
232 - fi
233 - else
234 - if ! linux_config_exists \
235 - || ! linux_chkconfig_present HID_WACOM; then
236 - echo
237 - ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
238 - ewarn " Device Drivers --->"
239 - ewarn " HID support --->"
240 - ewarn " Special HID drivers --->"
241 - ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
242 - echo
243 - fi
244 - fi
245 -
246 -}
247
248 diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild
249 deleted file mode 100644
250 index 47a540cf7b6..00000000000
251 --- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild
252 +++ /dev/null
253 @@ -1,73 +0,0 @@
254 -# Copyright 1999-2018 Gentoo Foundation
255 -# Distributed under the terms of the GNU General Public License v2
256 -
257 -EAPI=5
258 -
259 -inherit linux-info xorg-2
260 -
261 -DESCRIPTION="Driver for Wacom tablets and drawing devices"
262 -HOMEPAGE="http://linuxwacom.sourceforge.net/"
263 -LICENSE="GPL-2"
264 -EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
265 -[[ ${PV} != 9999* ]] && \
266 - SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
267 -
268 -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
269 -IUSE="debug"
270 -
271 -# depend on libwacom for its udev rules, bug #389633
272 -RDEPEND="dev-libs/libwacom
273 - virtual/udev
274 - >=x11-base/xorg-server-1.7
275 - x11-libs/libX11
276 - x11-libs/libXext
277 - x11-libs/libXi
278 - x11-libs/libXrandr
279 - x11-libs/libXinerama"
280 -DEPEND="${RDEPEND}
281 - x11-base/xorg-proto"
282 -
283 -pkg_setup() {
284 - linux-info_pkg_setup
285 -
286 - XORG_CONFIGURE_OPTIONS=(
287 - $(use_enable debug)
288 - )
289 -}
290 -
291 -src_install() {
292 - xorg-2_src_install
293 -
294 - rm -rf "${ED}"/usr/share/hal
295 -}
296 -
297 -pkg_pretend() {
298 - linux-info_pkg_setup
299 -
300 - if kernel_is lt 3 17; then
301 - if ! linux_config_exists \
302 - || ! linux_chkconfig_present TABLET_USB_WACOM \
303 - || ! linux_chkconfig_present INPUT_EVDEV; then
304 - echo
305 - ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
306 - ewarn " Device Drivers --->"
307 - ewarn " Input device support --->"
308 - ewarn " <*> Event interface"
309 - ewarn " [*] Tablets --->"
310 - ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
311 - echo
312 - fi
313 - else
314 - if ! linux_config_exists \
315 - || ! linux_chkconfig_present HID_WACOM; then
316 - echo
317 - ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
318 - ewarn " Device Drivers --->"
319 - ewarn " HID support --->"
320 - ewarn " Special HID drivers --->"
321 - ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
322 - echo
323 - fi
324 - fi
325 -
326 -}