gentoo resync : 05.02.2020

4 files changed, 60 insertions, 6 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index b891be925ded..cdadc929787f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
-EBUILD xkeyboard-config-2.28.ebuild 1258 BLAKE2B 1098f824b448d3b6beab9657f9589bd71cd0111bd58a968bb139301231d1ac677c5b21f2aaf231eb245cd6159f4ba7ffc9e7ca5adfdcff8f7744290bcabddff7 SHA512 3ccb42a720e2304539d4d09f1523b703629303c08616ce84dba5ccfbcfcc5bd459e8ad7f7af3280ee473ccf587026e8425536008f7becb44b3296f09e5a96a51
-EBUILD xkeyboard-config-9999.ebuild 1216 BLAKE2B 59e22f817504c8a13afb331880a98b300cd4b76797f1dd1b713833f699733548f5d2fd54f28bc3e4fa541a150e261e3ef39276648c1eccbfe42304101f922a1d SHA512 9a2f7ea4d02157d28979c6564c07b864f1be22ea3acb73e054ed8cf69a89e527b301a480f0e9e600d5b334fcc6bdfdb188bac65afdc7e081c68d2338cbccaadb
+DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
+EBUILD xkeyboard-config-2.28.ebuild 1259 BLAKE2B 089507e83606f70d0a1091a45da09c8359484d05f6415e65bfb074e6bf59dca2d584789dea15d7ebebaffb5c22b1a2d233d14c87c2b36d8fdc3931fc5c1c0922 SHA512 cb8a8a032239aadd8663f23a360edba592b6ece8e3bbe26ff6642f9c72701bc5b8872b4df85240864626c5f76675a00014f1146113f7dfc633cd72f20e62e4de
+EBUILD xkeyboard-config-2.29.ebuild 1233 BLAKE2B 8e4e631f47f021b410d03c9d0ee7f7c55848b895a94c4a0725011d57e3c1e375955d8e7021dfe98e2fc1375b6a4e774a96703497e3a7e13be6bbc416a89f7b58 SHA512 912b4fabe79b3164b716fbb6986dba42e1f4a233442ea1a00a56f5ad78fc5019f7212c06670d0d233fd238da13c434ad8ad288d3955f33c3d916aefc52762f70
+EBUILD xkeyboard-config-9999.ebuild 1233 BLAKE2B 8e4e631f47f021b410d03c9d0ee7f7c55848b895a94c4a0725011d57e3c1e375955d8e7021dfe98e2fc1375b6a4e774a96703497e3a7e13be6bbc416a89f7b58 SHA512 912b4fabe79b3164b716fbb6986dba42e1f4a233442ea1a00a56f5ad78fc5019f7212c06670d0d233fd238da13c434ad8ad288d3955f33c3d916aefc52762f70
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
index 0cc5883a831f..d39b0ceaa6af 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
@@ -13,7 +13,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
new file mode 100644
index 000000000000..95509d07acfc
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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=""
+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[@]}"
+}
+
+src_test() {
+	:;
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 65c25664dd43..95509d07acfc 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -26,9 +26,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 RDEPEND=""
-DEPEND="
-	${LIVE_DEPEND}
-"
+DEPEND="${LIVE_DEPEND}"
 
 src_prepare() {
 	default
@@ -46,3 +44,7 @@ src_configure() {
 
 	econf "${econfargs[@]}"
 }
+
+src_test() {
+	:;
+}