From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 889A7138350 for ; Tue, 17 Mar 2020 07:22:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A94BE0B11; Tue, 17 Mar 2020 07:22:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BF7DE0B11 for ; Tue, 17 Mar 2020 07:22:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F94A34F1F9 for ; Tue, 17 Mar 2020 07:22:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF09214C for ; Tue, 17 Mar 2020 07:22:16 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1584429713.9ab49193d9e8645eeaa98aa14b5ecd79084bc964.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild X-VCS-Directories: x11-misc/xkeyboard-config/files/ x11-misc/xkeyboard-config/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9ab49193d9e8645eeaa98aa14b5ecd79084bc964 X-VCS-Branch: master Date: Tue, 17 Mar 2020 07:22:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d963a58-9173-4525-9a8b-017f7c073c80 X-Archives-Hash: 876a33cc5f70a0e8c71521bd915eaa91 commit: 9ab49193d9e8645eeaa98aa14b5ecd79084bc964 Author: Matt Turner gentoo org> AuthorDate: Tue Mar 17 07:19:02 2020 +0000 Commit: Matt Turner gentoo 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 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 +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