gentoo resync : 22.10.2018

3 files changed, 55 insertions, 2 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ddb34d10e73a..73c14eee274c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,9 +1,11 @@
 AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
 DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
+DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 EBUILD xkeyboard-config-2.23.1-r1.ebuild 1131 BLAKE2B c959f3a2c32887490d4e5723b0b219c887f347d2c839a9038226065ba7d8d11d44c08857c352fd1f84973140adbff5f7c6d7e137f7fad5ed3c6a236a3b2d1193 SHA512 f212dc2bf40ca4297f4e0ec5f4faec599e4d836109282a511826186a9ebae190eae2e12a0f409e225756914c70715f09c2b896b86b1ad8567b0dfafc5ff5aab2
 EBUILD xkeyboard-config-2.23.1-r2.ebuild 1250 BLAKE2B 5a694d2394b39a7f998753cd77c8995aca9659845b56a4fd299d4c56d63f3f1abc0192a2888f7f3e36bd51e4cbce3e4b2fda502612d50271d64a2b928c267fbf SHA512 fe6e2b00bd09d9d4adcfc3683309e98350580f27ba965ca8ca8017ba666dc094a3746e6f4d38d0d96065b27af83d06cd1a4e180d7e2135c5e345b6af4bd08135
 EBUILD xkeyboard-config-2.24-r1.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
 EBUILD xkeyboard-config-2.24.ebuild 1084 BLAKE2B 790e68a4f4b1ecb3c534d1ca086ee44746fd295bedcec05fa2edcad92a7c0ec60dc686bf7a9d39204b37c9e1b7498ebea69081b0c62cf1098f769f6a54cfd746 SHA512 1c2888737aea4b19df1dbc6d9d8859e54716986982ed961a160da1face286f6c4c702781987b4f6ec68a6b9f1a80d6e0d17eef714961b29a08ad3acf2a582222
-EBUILD xkeyboard-config-9999.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
+EBUILD xkeyboard-config-2.25.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
+EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
new file mode 100644
index 000000000000..9c806160acaa
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 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"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/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="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+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-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index e517c9fc8366..9c806160acaa 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7