1 |
commit: d86a80381cc57a626900ab32788a0da55c95e6eb |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 29 18:11:00 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 29 18:16:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86a8038 |
7 |
|
8 |
dev-libs/libwacom: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
dev-libs/libwacom/Manifest | 2 - |
13 |
.../files/libwacom-1.1-configurable_docs.patch | 39 -------------- |
14 |
.../files/libwacom-1.1-match-with-autotools.patch | 24 --------- |
15 |
.../files/libwacom-1.1-meson-add-private.patch | 21 -------- |
16 |
dev-libs/libwacom/libwacom-1.1.ebuild | 46 ----------------- |
17 |
dev-libs/libwacom/libwacom-1.7.ebuild | 60 ---------------------- |
18 |
6 files changed, 192 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest |
21 |
index 0767b94283f..11b8aeb2b24 100644 |
22 |
--- a/dev-libs/libwacom/Manifest |
23 |
+++ b/dev-libs/libwacom/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b |
26 |
-DIST libwacom-1.7.tar.bz2 513320 BLAKE2B 36cead331b8d79fa629803441190de2c28e22c0e70822075d0ff31552f780e93d606ec2229a2fee744d9e6b91eb4879cb5a202075caf6adf1301b07502cefb7b SHA512 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066 |
27 |
DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa |
28 |
|
29 |
diff --git a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch |
30 |
deleted file mode 100644 |
31 |
index 47eb27d54bf..00000000000 |
32 |
--- a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch |
33 |
+++ /dev/null |
34 |
@@ -1,39 +0,0 @@ |
35 |
-From 18722d30b9eb38d0cd22609e076ad45c810f137d Mon Sep 17 00:00:00 2001 |
36 |
-From: David Heidelberg <david@××××.cz> |
37 |
-Date: Sun, 27 Oct 2019 20:34:55 +0100 |
38 |
-Subject: [PATCH] meson: make documentation a feature |
39 |
- |
40 |
-Nice to have for distributions, which needs to have predicable build. |
41 |
- |
42 |
-Signed-off-by: David Heidelberg <david@××××.cz> |
43 |
---- |
44 |
- meson.build | 3 ++- |
45 |
- meson_options.txt | 4 ++++ |
46 |
- 2 files changed, 6 insertions(+), 1 deletion(-) |
47 |
- |
48 |
-diff --git a/meson.build b/meson.build |
49 |
-index 8283613..be2fcb3 100644 |
50 |
---- a/meson.build |
51 |
-+++ b/meson.build |
52 |
-@@ -460,7 +460,8 @@ install_man(configure_file(input: 'tools/libwacom-list-local-devices.man', |
53 |
- copy: true)) |
54 |
- |
55 |
- ############### docs ########################### |
56 |
--doxygen = find_program('doxygen', required: false) |
57 |
-+docs_feature = get_option('documentation') |
58 |
-+doxygen = find_program('doxygen', required: docs_feature) |
59 |
- if doxygen.found() |
60 |
- src_doxygen = [ |
61 |
- join_paths(dir_src, 'libwacom.h'), |
62 |
-diff --git a/meson_options.txt b/meson_options.txt |
63 |
-index 1d75434..84c92bf 100644 |
64 |
---- a/meson_options.txt |
65 |
-+++ b/meson_options.txt |
66 |
-@@ -1,3 +1,7 @@ |
67 |
-+option('documentation', |
68 |
-+ type: 'feature', |
69 |
-+ value: 'auto', |
70 |
-+ description: 'Build doxygen documentation [default=auto]') |
71 |
- option('udev-dir', |
72 |
- type: 'string', |
73 |
- value: '', |
74 |
|
75 |
diff --git a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch |
76 |
deleted file mode 100644 |
77 |
index 06858cd36ad..00000000000 |
78 |
--- a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch |
79 |
+++ /dev/null |
80 |
@@ -1,24 +0,0 @@ |
81 |
-From 07753990d7476d52cfd34fb7558c077bd8b44eeb Mon Sep 17 00:00:00 2001 |
82 |
-From: Peter Hutterer <peter.hutterer@×××××.net> |
83 |
-Date: Mon, 23 Sep 2019 09:29:45 +1000 |
84 |
-Subject: [PATCH] meson.build: match the libwacom.pc file Name with the |
85 |
- autotools one (#164) |
86 |
- |
87 |
-Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net> |
88 |
---- |
89 |
- meson.build | 2 +- |
90 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
91 |
- |
92 |
-diff --git a/meson.build b/meson.build |
93 |
-index 13459f7..3e0cc07 100644 |
94 |
---- a/meson.build |
95 |
-+++ b/meson.build |
96 |
-@@ -81,7 +81,7 @@ dep_libwacom = declare_dependency(link_with: lib_libwacom) |
97 |
- install_headers('libwacom/libwacom.h', subdir: 'libwacom-1.0/libwacom') |
98 |
- |
99 |
- pkgconfig.generate(filebase: 'libwacom', |
100 |
-- name: 'Libwacom', |
101 |
-+ name: 'libwacom', |
102 |
- description: 'Wacom model feature query library', |
103 |
- version: meson.project_version(), |
104 |
- subdirs: 'libwacom-1.0', |
105 |
|
106 |
diff --git a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch |
107 |
deleted file mode 100644 |
108 |
index e31df3a683d..00000000000 |
109 |
--- a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch |
110 |
+++ /dev/null |
111 |
@@ -1,21 +0,0 @@ |
112 |
-From 6953c5a9fc51e286134cb977b3fdfe0999f3503a Mon Sep 17 00:00:00 2001 |
113 |
-From: worldofpeace <worldofpeace@××××××××××.ch> |
114 |
-Date: Sun, 22 Sep 2019 19:04:58 -0400 |
115 |
-Subject: [PATCH] meson: add private requires to .pc (#163) |
116 |
- |
117 |
---- |
118 |
- meson.build | 1 + |
119 |
- 1 file changed, 1 insertion(+) |
120 |
- |
121 |
-diff --git a/meson.build b/meson.build |
122 |
-index 0ae03e1..13459f7 100644 |
123 |
---- a/meson.build |
124 |
-+++ b/meson.build |
125 |
-@@ -85,6 +85,7 @@ pkgconfig.generate(filebase: 'libwacom', |
126 |
- description: 'Wacom model feature query library', |
127 |
- version: meson.project_version(), |
128 |
- subdirs: 'libwacom-1.0', |
129 |
-+ requires_private: deps_libwacom, |
130 |
- libraries: lib_libwacom) |
131 |
- |
132 |
- #################### data files ######################## |
133 |
|
134 |
diff --git a/dev-libs/libwacom/libwacom-1.1.ebuild b/dev-libs/libwacom/libwacom-1.1.ebuild |
135 |
deleted file mode 100644 |
136 |
index 786822b481a..00000000000 |
137 |
--- a/dev-libs/libwacom/libwacom-1.1.ebuild |
138 |
+++ /dev/null |
139 |
@@ -1,46 +0,0 @@ |
140 |
-# Copyright 1999-2020 Gentoo Authors |
141 |
-# Distributed under the terms of the GNU General Public License v2 |
142 |
- |
143 |
-EAPI=7 |
144 |
- |
145 |
-inherit meson udev toolchain-funcs |
146 |
- |
147 |
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features" |
148 |
-HOMEPAGE="https://github.com/linuxwacom/libwacom" |
149 |
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2" |
150 |
- |
151 |
-LICENSE="MIT" |
152 |
-SLOT="0" |
153 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86" |
154 |
-IUSE="doc test" |
155 |
-RESTRICT="!test? ( test )" |
156 |
- |
157 |
-BDEPEND=" |
158 |
- virtual/pkgconfig |
159 |
- doc? ( app-doc/doxygen ) |
160 |
-" |
161 |
-RDEPEND=" |
162 |
- dev-libs/glib:2 |
163 |
- dev-libs/libgudev:= |
164 |
-" |
165 |
-DEPEND="${RDEPEND}" |
166 |
- |
167 |
-PATCHES=( |
168 |
- "${FILESDIR}/${P}-meson-add-private.patch" |
169 |
- "${FILESDIR}/${P}-match-with-autotools.patch" |
170 |
- "${FILESDIR}/${P}-configurable_docs.patch" |
171 |
-) |
172 |
- |
173 |
-pkg_setup() { |
174 |
- tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170 |
175 |
-} |
176 |
- |
177 |
-src_configure() { |
178 |
- local emesonargs=( |
179 |
- $(meson_feature doc documentation) |
180 |
- $(meson_use test tests) |
181 |
- -Dudev-dir=$(get_udevdir) |
182 |
- |
183 |
- ) |
184 |
- meson_src_configure |
185 |
-} |
186 |
|
187 |
diff --git a/dev-libs/libwacom/libwacom-1.7.ebuild b/dev-libs/libwacom/libwacom-1.7.ebuild |
188 |
deleted file mode 100644 |
189 |
index 0c54c6c491e..00000000000 |
190 |
--- a/dev-libs/libwacom/libwacom-1.7.ebuild |
191 |
+++ /dev/null |
192 |
@@ -1,60 +0,0 @@ |
193 |
-# Copyright 1999-2020 Gentoo Authors |
194 |
-# Distributed under the terms of the GNU General Public License v2 |
195 |
- |
196 |
-EAPI=7 |
197 |
- |
198 |
-PYTHON_COMPAT=( python3_{7..9} ) |
199 |
- |
200 |
-inherit meson python-any-r1 toolchain-funcs udev |
201 |
- |
202 |
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features" |
203 |
-HOMEPAGE="https://github.com/linuxwacom/libwacom" |
204 |
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2" |
205 |
- |
206 |
-LICENSE="MIT" |
207 |
-SLOT="0" |
208 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
209 |
-IUSE="doc test" |
210 |
-RESTRICT="!test? ( test )" |
211 |
- |
212 |
-BDEPEND=" |
213 |
- virtual/pkgconfig |
214 |
- doc? ( app-doc/doxygen ) |
215 |
- test? ( |
216 |
- ${PYTHON_DEPS} |
217 |
- $(python_gen_any_dep ' |
218 |
- dev-python/python-libevdev[${PYTHON_USEDEP}] |
219 |
- dev-python/pyudev[${PYTHON_USEDEP}] |
220 |
- dev-python/pytest[${PYTHON_USEDEP}] |
221 |
- ') |
222 |
- ) |
223 |
-" |
224 |
-RDEPEND=" |
225 |
- dev-libs/glib:2 |
226 |
- dev-libs/libgudev:= |
227 |
-" |
228 |
-DEPEND="${RDEPEND}" |
229 |
- |
230 |
-python_check_deps() { |
231 |
- has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" && |
232 |
- has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" && |
233 |
- has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" |
234 |
-} |
235 |
- |
236 |
-pkg_setup() { |
237 |
- tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170 |
238 |
- |
239 |
- if use test; then |
240 |
- python-any-r1_pkg_setup |
241 |
- fi |
242 |
-} |
243 |
- |
244 |
-src_configure() { |
245 |
- local emesonargs=( |
246 |
- $(meson_feature doc documentation) |
247 |
- $(meson_feature test tests) |
248 |
- -Dudev-dir=$(get_udevdir) |
249 |
- |
250 |
- ) |
251 |
- meson_src_configure |
252 |
-} |