summaryrefslogtreecommitdiff
path: root/x11-misc/xkeyboard-config
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-misc/xkeyboard-config
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'x11-misc/xkeyboard-config')
-rw-r--r--x11-misc/xkeyboard-config/Manifest5
-rw-r--r--x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch34
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild62
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild2
4 files changed, 2 insertions, 101 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 596493a2da9a..ef2e59af73a9 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,7 +1,4 @@
-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
DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
-EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
-EBUILD xkeyboard-config-2.30.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
+EBUILD xkeyboard-config-2.30.ebuild 1336 BLAKE2B 37c5040ff351aba7f8aeeb4c3a59fd02263d4ddc9fe0bae39e62361dfe5b1e222a3cbf428086aea90c8367fef6163087d884b1bfb64c13e4bf5403967da5d298 SHA512 415f4f5347c8b825208375a5c5839599e352970a5532fee8ef18d736f17ad8c135907ac1cf5afb3a2ba2fbe0db63de050add2e5d3a761b4b5c58bbafb554a208
EBUILD xkeyboard-config-9999.ebuild 1023 BLAKE2B bd4b25cfb97dbd822f4b2e06200833139dacf0c1e689e4ea50c7cd779a8b86d3e79bde1581bab7ea3fa55b205b7291ba255b1f6d2992ddfa2755327a4f33d5f8 SHA512 87e81c2aa3ab90331386369e160be599051e831c6ea59ecb0345e829b376acc4f820aad418020852431357bd470feea2999fbdedaa8f0dee372a792fb23572a8
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
deleted file mode 100644
index 0f4d455f6ea3..000000000000
--- 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 37f50f131e36..000000000000
--- 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() {
- :;
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
index 66e3276b4ab7..8d68c4fd0cca 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
@@ -16,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 ~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"