gentoo resync : 11.02.2018

3 files changed, 69 insertions, 0 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1bf770345a20..288a296be635 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,3 +1,4 @@
+AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
 DIST xkeyboard-config-2.20.tar.bz2 978275 BLAKE2B 5d24adb829057f9600c7de0dd028af067d23a9138de87438fcc03936e48c1908fc4740f41c8f87be90ec0edbadd20735859a7fe184f5c4704ee819a1c248a091 SHA512 29584096874cf8f1444ed00374150fb186e9a74221b384d779bcf01c0762977f8a6a1b3dfa37acd560667a79cc80d4c0d39729b7dc21809520a7254026439db4
 DIST xkeyboard-config-2.21.tar.bz2 994972 BLAKE2B d6810fce00cad5fc296bd744831a13e797d8e03dada40445cf4a81b328470517f0ced8d9d0e734d9d8d35da4727ac9ff74488e118a8b7fe8c2e9cd6d364854f0 SHA512 c8c3da9d78365878b051bcfecc7c51e89c5aa15e6e3ba5e8c84612eaca4ca7741702c023f9571ac04c865f2951a7ca33f4fbbedb3baf6c76441ebf59c4e41068
 DIST xkeyboard-config-2.22.tar.bz2 1046333 BLAKE2B 5a869154be04a84c57bd93896e0ada5598b1aa788a10952e5432820d5511c3d9fb101f995248115affb4c3270754b05757af4c91c4273f16299eaba6db5fb285 SHA512 1697cc1a49625eb608d8ab1f54f9f37e37facc482fc8bae5ebff9e3336efdd2f57e0ed95db0a9745d49f1bc21e2cfa792d0849f4057745d8be8f7abac4893f97
@@ -5,5 +6,6 @@ DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2f
 EBUILD xkeyboard-config-2.20.ebuild 1086 BLAKE2B c54d81bea0488c185ef3816207923e7aa32ccd0372b79d97a584a90b4526f48953785ec49317fb22cd32bf2620b31c221d8f0613d00994c5807f9fadf9bd2f4b SHA512 047047ca71e89b11bf602c965a487d28571fd3bd68f3648970be46cd9ea9b23ee9b696333615bb8d4d2413cdb2bb209b4bf7411f8b45433899ae47c8db142d08
 EBUILD xkeyboard-config-2.21.ebuild 1095 BLAKE2B 40ebc90c93bc8f8b5ca681ba8ae6ee5dc3524031bd13ffc63c550fb7036623c2e4dcd24899d92f9cba0c2066cd486c640bb36a753f343a6d0354c8518f195cd3 SHA512 63c9db467b36f66ce54248f7eb5c8dc6528242a3d2844a70905bd8f006233678de67003f0cd81f092a0fa2db2a4570d15e63f6a2c97a42a26eda5fdd52b1c364
 EBUILD xkeyboard-config-2.22.ebuild 1095 BLAKE2B 40ebc90c93bc8f8b5ca681ba8ae6ee5dc3524031bd13ffc63c550fb7036623c2e4dcd24899d92f9cba0c2066cd486c640bb36a753f343a6d0354c8518f195cd3 SHA512 63c9db467b36f66ce54248f7eb5c8dc6528242a3d2844a70905bd8f006233678de67003f0cd81f092a0fa2db2a4570d15e63f6a2c97a42a26eda5fdd52b1c364
+EBUILD xkeyboard-config-2.23.1-r1.ebuild 1152 BLAKE2B 7b39d07a45e9e2e58f5fe8df0b27e7938fcb1f72bf5d1c27c6ea52826251a45d699bf5f109030b520f8d968994a15d30f85a8a0083216e55cba2d660328d9a28 SHA512 cfe8031ae6ea8cdd3b7eefbacd63e728d5451a2a5a0dc480725b391f9bcf8209bf13e3d9934d04e56500c0af23c9d392c4044b2cd562fcf0e1dcfbe73d893598
 EBUILD xkeyboard-config-2.23.1.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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 000000000000..7d9e6fca2dca
--- /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@ubuntu.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 000000000000..4a9d40a48f1e
--- /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
+}