* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/
@ 2018-02-05 22:31 Chí-Thanh Christopher Nguyễn
0 siblings, 0 replies; 3+ messages in thread
From: Chí-Thanh Christopher Nguyễn @ 2018-02-05 22:31 UTC (permalink / raw
To: gentoo-commits
commit: cba05e849ae9ec7289f44eb2f624030c95b83f4b
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 22:28:08 2018 +0000
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 22:31:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba05e84
x11-misc/xkeyboard-config: add patch to fix pl keyboard layout
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104904
Closes: https://bugs.gentoo.org/show_bug.cgi?id=646434
Package-Manager: Portage-2.3.19, Repoman-2.3.6
...keyboard-config-2.23.1_fix_typo_in_polish.patch | 25 +++++++++++++
.../xkeyboard-config-2.23.1-r1.ebuild | 42 ++++++++++++++++++++++
2 files changed, 67 insertions(+)
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
new file mode 100644
index 00000000000..7d9e6fca2dc
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch
@@ -0,0 +1,25 @@
+From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
+From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+Date: Thu, 1 Feb 2018 15:37:46 +0100
+Subject: Fix typo in Polish symbols file
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104904
+---
+ symbols/pl | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/symbols/pl b/symbols/pl
+index 52e7959..800cb85 100644
+--- a/symbols/pl
++++ b/symbols/pl
+@@ -497,7 +497,6 @@ partial alphanumeric_keys
+ include "sun_vndr/pl(sun_type6)"
+ };
+
+-------------------------------
+ //Glagolica
+ partial alphanumeric_keys
+ xkb_symbols "glagolica"
+--
+cgit v1.1
+
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
new file mode 100644
index 00000000000..4a9d40a48f1
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="!<x11-apps/xkbcomp-1.2.3
+ !<x11-libs/libX11-1.4.3"
+DEPEND="
+ sys-devel/gettext
+ dev-util/intltool"
+
+PATCHES=( "${FILESDIR}"/${P}_fix_typo_in_polish.patch )
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+ --enable-compat-rules
+ # do not check for runtime deps
+ --disable-runtime-deps
+ --with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+ xorg-2_src_prepare
+ if [[ ${XORG_EAUTORECONF} != no ]]; then
+ intltoolize --copy --automake || die
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/
@ 2020-03-17 7:22 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-03-17 7:22 UTC (permalink / raw
To: gentoo-commits
commit: 9ab49193d9e8645eeaa98aa14b5ecd79084bc964
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 07:19:02 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 07:21:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab49193
x11-misc/xkeyboard-config: Fix shebang
Bug: https://bugs.gentoo.org/712792
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...xkeyboard-config-2.29-fix-python3-support.patch | 34 ++++++++++++++++++++++
.../xkeyboard-config/xkeyboard-config-2.29.ebuild | 4 +++
2 files changed, 38 insertions(+)
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
new file mode 100644
index 00000000000..0f4d455f6ea
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
@@ -0,0 +1,34 @@
+From c847c834cce190c5c835a454bfe548195da9fa53 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Sun, 16 Feb 2020 09:41:43 +0000
+Subject: [PATCH] fix python3 support
+
+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197
+---
+ rules/compat/map-variants.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py
+index ebbfec9..979ba43 100755
+--- a/rules/compat/map-variants.py
++++ b/rules/compat/map-variants.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ import argparse
+ import re
+@@ -12,8 +12,8 @@ class Layout(object):
+ assert variant is None
+ # parse a layout(variant) string
+ match = re.match(r'([^(]+)\(([^)]+)\)', layout)
+- self.layout = match[1]
+- self.variant = match[2]
++ self.layout = match.groups()[0]
++ self.variant = match.groups()[1]
+
+ def __str__(self):
+ if self.variant:
+--
+2.24.1
+
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
index 318c18a9da6..6ff6eec8778 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
@@ -28,6 +28,10 @@ BDEPEND="
RDEPEND=""
DEPEND="${LIVE_DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-python3-support.patch
+)
+
src_prepare() {
default
[[ ${PV} == 9999 ]] && eautoreconf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/
@ 2020-08-09 17:52 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-08-09 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 80bd438c540498b6809bf1bdb54127db965eab07
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 17:50:35 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 17:52:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bd438c
x11-misc/xkeyboard-config: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-misc/xkeyboard-config/Manifest | 1 -
...xkeyboard-config-2.29-fix-python3-support.patch | 34 ------------
.../xkeyboard-config/xkeyboard-config-2.29.ebuild | 62 ----------------------
3 files changed, 97 deletions(-)
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index a5432b31395..9a8ef99b2bb 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1 @@
-DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
deleted file mode 100644
index 0f4d455f6ea..00000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c847c834cce190c5c835a454bfe548195da9fa53 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Sun, 16 Feb 2020 09:41:43 +0000
-Subject: [PATCH] fix python3 support
-
-https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197
----
- rules/compat/map-variants.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py
-index ebbfec9..979ba43 100755
---- a/rules/compat/map-variants.py
-+++ b/rules/compat/map-variants.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
-
- import argparse
- import re
-@@ -12,8 +12,8 @@ class Layout(object):
- assert variant is None
- # parse a layout(variant) string
- match = re.match(r'([^(]+)\(([^)]+)\)', layout)
-- self.layout = match[1]
-- self.variant = match[2]
-+ self.layout = match.groups()[0]
-+ self.variant = match.groups()[1]
-
- def __str__(self):
- if self.variant:
---
-2.24.1
-
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
deleted file mode 100644
index 37f50f131e3..00000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
- inherit autotools git-r3
- # x11-misc/util-macros only required on live ebuilds
- LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
- SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="${LIVE_DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-python3-support.patch
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- local econfargs=(
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
- --enable-compat-rules
- # do not check for runtime deps
- --disable-runtime-deps
- --with-xkb-rules-symlink=xorg
- )
-
- econf "${econfargs[@]}"
-}
-
-src_test() {
- :;
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-09 17:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-17 7:22 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2020-08-09 17:52 Matt Turner
2018-02-05 22:31 Chí-Thanh Christopher Nguyễn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox