[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/

["Matt Turner" <mattst88@gentoo.org>]

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