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

[Chí-Thanh Christopher Nguyễn]

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@××××××.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
+}