1 |
commit: a0584b3bce0c4c2c382cc394c3800923e8bcf58b |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 29 05:15:08 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 29 05:17:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0584b3b |
7 |
|
8 |
x11-misc/xkeyboard-config: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
x11-misc/xkeyboard-config/Manifest | 2 - |
13 |
...keyboard-config-2.23.1_fix_typo_in_polish.patch | 25 ---------- |
14 |
.../xkeyboard-config-2.23.1-r1.ebuild | 42 ----------------- |
15 |
.../xkeyboard-config-2.23.1-r2.ebuild | 55 ---------------------- |
16 |
.../xkeyboard-config-2.24-r1.ebuild | 51 -------------------- |
17 |
.../xkeyboard-config/xkeyboard-config-2.24.ebuild | 40 ---------------- |
18 |
6 files changed, 215 deletions(-) |
19 |
|
20 |
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest |
21 |
index 25ccf5de1cf..c57328977b6 100644 |
22 |
--- a/x11-misc/xkeyboard-config/Manifest |
23 |
+++ b/x11-misc/xkeyboard-config/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba |
26 |
-DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0 |
27 |
DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb |
28 |
|
29 |
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch |
30 |
deleted file mode 100644 |
31 |
index 7d9e6fca2dc..00000000000 |
32 |
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch |
33 |
+++ /dev/null |
34 |
@@ -1,25 +0,0 @@ |
35 |
-From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001 |
36 |
-From: Gunnar Hjalmarsson <gunnarhj@××××××.com> |
37 |
-Date: Thu, 1 Feb 2018 15:37:46 +0100 |
38 |
-Subject: Fix typo in Polish symbols file |
39 |
- |
40 |
-https://bugs.freedesktop.org/show_bug.cgi?id=104904 |
41 |
---- |
42 |
- symbols/pl | 1 - |
43 |
- 1 file changed, 1 deletion(-) |
44 |
- |
45 |
-diff --git a/symbols/pl b/symbols/pl |
46 |
-index 52e7959..800cb85 100644 |
47 |
---- a/symbols/pl |
48 |
-+++ b/symbols/pl |
49 |
-@@ -497,7 +497,6 @@ partial alphanumeric_keys |
50 |
- include "sun_vndr/pl(sun_type6)" |
51 |
- }; |
52 |
- |
53 |
-------------------------------- |
54 |
- //Glagolica |
55 |
- partial alphanumeric_keys |
56 |
- xkb_symbols "glagolica" |
57 |
--- |
58 |
-cgit v1.1 |
59 |
- |
60 |
|
61 |
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild |
62 |
deleted file mode 100644 |
63 |
index 34dead4f82a..00000000000 |
64 |
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild |
65 |
+++ /dev/null |
66 |
@@ -1,42 +0,0 @@ |
67 |
-# Copyright 1999-2018 Gentoo Foundation |
68 |
-# Distributed under the terms of the GNU General Public License v2 |
69 |
- |
70 |
-EAPI=5 |
71 |
- |
72 |
-XORG_STATIC=no |
73 |
-inherit xorg-2 |
74 |
- |
75 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git" |
76 |
- |
77 |
-DESCRIPTION="X keyboard configuration database" |
78 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" |
79 |
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2" |
80 |
- |
81 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
82 |
-IUSE="" |
83 |
- |
84 |
-LICENSE="MIT" |
85 |
-SLOT="0" |
86 |
- |
87 |
-RDEPEND="!<x11-apps/xkbcomp-1.2.3 |
88 |
- !<x11-libs/libX11-1.4.3" |
89 |
-DEPEND=" |
90 |
- sys-devel/gettext |
91 |
- dev-util/intltool" |
92 |
- |
93 |
-PATCHES=( "${FILESDIR}"/${P}_fix_typo_in_polish.patch ) |
94 |
- |
95 |
-XORG_CONFIGURE_OPTIONS=( |
96 |
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" |
97 |
- --enable-compat-rules |
98 |
- # do not check for runtime deps |
99 |
- --disable-runtime-deps |
100 |
- --with-xkb-rules-symlink=xorg |
101 |
-) |
102 |
- |
103 |
-src_prepare() { |
104 |
- xorg-2_src_prepare |
105 |
- if [[ ${XORG_EAUTORECONF} != no ]]; then |
106 |
- intltoolize --copy --automake || die |
107 |
- fi |
108 |
-} |
109 |
|
110 |
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild |
111 |
deleted file mode 100644 |
112 |
index 8ee5f1f9f5f..00000000000 |
113 |
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild |
114 |
+++ /dev/null |
115 |
@@ -1,55 +0,0 @@ |
116 |
-# Copyright 1999-2018 Gentoo Foundation |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
- |
119 |
-EAPI=7 |
120 |
- |
121 |
-DESCRIPTION="X keyboard configuration database" |
122 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" |
123 |
- |
124 |
-if [[ ${PV} == 9999 ]]; then |
125 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git" |
126 |
- inherit autotools git-r3 |
127 |
- # x11-misc/util-macros only required on live ebuilds |
128 |
- LIVE_DEPEND=">=x11-misc/util-macros-1.18" |
129 |
-else |
130 |
- SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2" |
131 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
132 |
-fi |
133 |
- |
134 |
-LICENSE="MIT" |
135 |
-SLOT="0" |
136 |
-IUSE="" |
137 |
- |
138 |
-BDEPEND=" |
139 |
- virtual/pkgconfig |
140 |
-" |
141 |
-RDEPEND=" |
142 |
- !<x11-apps/xkbcomp-1.2.3 |
143 |
- !<x11-libs/libX11-1.4.3 |
144 |
-" |
145 |
-DEPEND=" |
146 |
- ${LIVE_DEPEND} |
147 |
- dev-util/intltool |
148 |
- sys-devel/gettext |
149 |
-" |
150 |
- |
151 |
-PATCHES=( |
152 |
- "${FILESDIR}"/${P}_fix_typo_in_polish.patch |
153 |
-) |
154 |
- |
155 |
-src_prepare() { |
156 |
- default |
157 |
- [[ ${PV} == 9999 ]] && eautoreconf |
158 |
-} |
159 |
- |
160 |
-src_configure() { |
161 |
- local econfargs=( |
162 |
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" |
163 |
- --enable-compat-rules |
164 |
- # do not check for runtime deps |
165 |
- --disable-runtime-deps |
166 |
- --with-xkb-rules-symlink=xorg |
167 |
- ) |
168 |
- |
169 |
- econf "${econfargs[@]}" |
170 |
-} |
171 |
|
172 |
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild |
173 |
deleted file mode 100644 |
174 |
index e517c9fc836..00000000000 |
175 |
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild |
176 |
+++ /dev/null |
177 |
@@ -1,51 +0,0 @@ |
178 |
-# Copyright 1999-2018 Gentoo Foundation |
179 |
-# Distributed under the terms of the GNU General Public License v2 |
180 |
- |
181 |
-EAPI=7 |
182 |
- |
183 |
-DESCRIPTION="X keyboard configuration database" |
184 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" |
185 |
- |
186 |
-if [[ ${PV} == 9999 ]]; then |
187 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git" |
188 |
- inherit autotools git-r3 |
189 |
- # x11-misc/util-macros only required on live ebuilds |
190 |
- LIVE_DEPEND=">=x11-misc/util-macros-1.18" |
191 |
-else |
192 |
- SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2" |
193 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
194 |
-fi |
195 |
- |
196 |
-LICENSE="MIT" |
197 |
-SLOT="0" |
198 |
-IUSE="" |
199 |
- |
200 |
-BDEPEND=" |
201 |
- virtual/pkgconfig |
202 |
-" |
203 |
-RDEPEND=" |
204 |
- !<x11-apps/xkbcomp-1.2.3 |
205 |
- !<x11-libs/libX11-1.4.3 |
206 |
-" |
207 |
-DEPEND=" |
208 |
- ${LIVE_DEPEND} |
209 |
- dev-util/intltool |
210 |
- sys-devel/gettext |
211 |
-" |
212 |
- |
213 |
-src_prepare() { |
214 |
- default |
215 |
- [[ ${PV} == 9999 ]] && eautoreconf |
216 |
-} |
217 |
- |
218 |
-src_configure() { |
219 |
- local econfargs=( |
220 |
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" |
221 |
- --enable-compat-rules |
222 |
- # do not check for runtime deps |
223 |
- --disable-runtime-deps |
224 |
- --with-xkb-rules-symlink=xorg |
225 |
- ) |
226 |
- |
227 |
- econf "${econfargs[@]}" |
228 |
-} |
229 |
|
230 |
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild |
231 |
deleted file mode 100644 |
232 |
index 46745dbde70..00000000000 |
233 |
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild |
234 |
+++ /dev/null |
235 |
@@ -1,40 +0,0 @@ |
236 |
-# Copyright 1999-2018 Gentoo Foundation |
237 |
-# Distributed under the terms of the GNU General Public License v2 |
238 |
- |
239 |
-EAPI=5 |
240 |
- |
241 |
-XORG_STATIC=no |
242 |
-inherit xorg-2 |
243 |
- |
244 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git" |
245 |
- |
246 |
-DESCRIPTION="X keyboard configuration database" |
247 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" |
248 |
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2" |
249 |
- |
250 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
251 |
-IUSE="" |
252 |
- |
253 |
-LICENSE="MIT" |
254 |
-SLOT="0" |
255 |
- |
256 |
-RDEPEND="!<x11-apps/xkbcomp-1.2.3 |
257 |
- !<x11-libs/libX11-1.4.3" |
258 |
-DEPEND=" |
259 |
- sys-devel/gettext |
260 |
- dev-util/intltool" |
261 |
- |
262 |
-XORG_CONFIGURE_OPTIONS=( |
263 |
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" |
264 |
- --enable-compat-rules |
265 |
- # do not check for runtime deps |
266 |
- --disable-runtime-deps |
267 |
- --with-xkb-rules-symlink=xorg |
268 |
-) |
269 |
- |
270 |
-src_prepare() { |
271 |
- xorg-2_src_prepare |
272 |
- if [[ ${XORG_EAUTORECONF} != no ]]; then |
273 |
- intltoolize --copy --automake || die |
274 |
- fi |
275 |
-} |