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-misc/xkeyboard-config/
Date: Tue, 26 Nov 2019 22:58:22
Message-Id: 1574808348.33f7fa843de147c39700195e78f0f2d915147f09.mattst88@gentoo
1 commit: 33f7fa843de147c39700195e78f0f2d915147f09
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 26 22:44:45 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 26 22:45:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f7fa84
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 | 1 -
13 .../xkeyboard-config/xkeyboard-config-2.27.ebuild | 51 ----------------------
14 2 files changed, 52 deletions(-)
15
16 diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
17 index c8814c5bc7b..dffadac602b 100644
18 --- a/x11-misc/xkeyboard-config/Manifest
19 +++ b/x11-misc/xkeyboard-config/Manifest
20 @@ -1,2 +1 @@
21 -DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
22 DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
23
24 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
25 deleted file mode 100644
26 index 29052cada6c..00000000000
27 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
28 +++ /dev/null
29 @@ -1,51 +0,0 @@
30 -# Copyright 1999-2019 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=7
34 -
35 -DESCRIPTION="X keyboard configuration database"
36 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
37 -
38 -if [[ ${PV} == 9999 ]]; then
39 - EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
40 - inherit autotools git-r3
41 - # x11-misc/util-macros only required on live ebuilds
42 - LIVE_DEPEND=">=x11-misc/util-macros-1.18"
43 -else
44 - SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
45 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
46 -fi
47 -
48 -LICENSE="MIT"
49 -SLOT="0"
50 -IUSE=""
51 -
52 -BDEPEND="
53 - dev-util/intltool
54 - sys-devel/gettext
55 - virtual/pkgconfig
56 -"
57 -RDEPEND="
58 - !<x11-apps/xkbcomp-1.2.3
59 - !<x11-libs/libX11-1.4.3
60 -"
61 -DEPEND="
62 - ${LIVE_DEPEND}
63 -"
64 -
65 -src_prepare() {
66 - default
67 - [[ ${PV} == 9999 ]] && eautoreconf
68 -}
69 -
70 -src_configure() {
71 - local econfargs=(
72 - --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
73 - --enable-compat-rules
74 - # do not check for runtime deps
75 - --disable-runtime-deps
76 - --with-xkb-rules-symlink=xorg
77 - )
78 -
79 - econf "${econfargs[@]}"
80 -}