gentoo Easter resync : 12.04.2020

5 files changed, 59 insertions, 57 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 32540b342635..ccf9baa9f8f0 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,5 @@
-DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
+AUX xkeyboard-config-2.29-fix-python3-support.patch 1042 BLAKE2B 0ca08ee5c3b82b4af1c9fe9b49fe5ad04a9978a7215f4381c4be96506067068fdf4204dbbd23976a4dd049779701ec3c52a09a961d9e1fecd153007e9ff00ecc SHA512 5619cbfa849792138b0e2785d8d94560707937bf15e026ed85a1ce255212d13bce61de5eeb3b8a6d4a431f41de58d03421911ef7abaf095163a38ca0c5304b3a
 DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
-EBUILD xkeyboard-config-2.28.ebuild 1259 BLAKE2B 00d1e92c69e95a5c098dd14f33d351d1b9efc2dfe6f7715ff9684b6ff4e0ce1864f4b2a9aa97f75fb063fea195fc399b1224b29cbbdd3e49181870a0296dd1b6 SHA512 fdd0311feddd07c143fc6614b8a71dfc120882963da30bf0f07e43c477e05ed9d9b1f21aff49053bcc7bb9ed207294b0916a7317e08bae7a1ff058b63c60a1fd
-EBUILD xkeyboard-config-2.29.ebuild 1233 BLAKE2B 56544c89955b57055e22b25ca084fdedc119607dd5851946ab472527fe48411e2025fd939f1f6117e041a73a96aa3b6d32326279fd81242a0f5fbe1f3ab4463b SHA512 65b17aafb3234f9c20c215300d7659c66931e242797b175975bba0a1ecd04659ac261944d6f4d63b55f75246d7375a72147669be5e729d4496efabd71efd5731
-EBUILD xkeyboard-config-9999.ebuild 1233 BLAKE2B 56544c89955b57055e22b25ca084fdedc119607dd5851946ab472527fe48411e2025fd939f1f6117e041a73a96aa3b6d32326279fd81242a0f5fbe1f3ab4463b SHA512 65b17aafb3234f9c20c215300d7659c66931e242797b175975bba0a1ecd04659ac261944d6f4d63b55f75246d7375a72147669be5e729d4496efabd71efd5731
+EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
+EBUILD xkeyboard-config-9999.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
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 000000000000..0f4d455f6ea3
--- /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.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
deleted file mode 100644
index 3291be05d506..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-"
-
-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[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
index 712663d9504c..37f50f131e36 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
@@ -3,6 +3,9 @@
 
 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"
 
@@ -13,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	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"
@@ -21,6 +24,7 @@ SLOT="0"
 IUSE=""
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -28,6 +32,14 @@ BDEPEND="
 RDEPEND=""
 DEPEND="${LIVE_DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-python3-support.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 712663d9504c..66e3276b4ab7 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -3,6 +3,9 @@
 
 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"
 
@@ -13,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	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"
@@ -21,6 +24,7 @@ SLOT="0"
 IUSE=""
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -28,6 +32,10 @@ BDEPEND="
 RDEPEND=""
 DEPEND="${LIVE_DEPEND}"
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf