gentoo auto-resync : 16:10:2023 - 09:55:38

6 files changed, 59 insertions, 5 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 04fd32c4f630..7a48a6ae703b 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 3526056151e9..767fc6ed3b0d 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.39.tar.xz 896112 BLAKE2B d1ef598a0c1993518b01e73c319147ea1f3e55e1c8040762b9e95636c89d9b719322f3f2a1a87bffc545928b2912ead37f336182ba69d692893521322f170e21 SHA512 4690a0291c1f8c2c53b84984221a60a935c9b7cfc8ae20a8740403571f3704dedf06e5755b45775a15a5df21ebd2acac3ff785ff19f54d792ae359c4c6d60756
+DIST xkeyboard-config-2.40.tar.xz 893584 BLAKE2B 79dd20e588e72c9fe65ff0885889ae3e2ad0ffbb66b27cf90db36fecfd41f24667fcc0a0a7fc96f3bc5d01502532af3e6b560719413bc16529328dd02d353c92 SHA512 00c965e747169194d9a8d1ed0dfd544988c70df6a69888c50a06b4e266ce7047a8696ce408b9a7ba91e7e6b9679ab6e5f014308dbbf0a9c6be0e948d7646f878
 EBUILD xkeyboard-config-2.39.ebuild 1003 BLAKE2B eec1fec962f65eaef104088b3a21cbaf7af9fc7156411c63ff103718103663f16d9752701be551d98d5bee8f6307f9fdf9a77845316a24c91399470c483e1479 SHA512 efbfca4459134833abc2b6d24f5e4853684cfdcff1ab720071519432da307b92f169e01ae1751ee9fa283733c3aab51c402054b6069c84c0d14ef10894f9b6e2
-EBUILD xkeyboard-config-9999.ebuild 1011 BLAKE2B d43dbe3575ff6587a8e15aeb41d75f87feb223ec6ddc4db8b3a8161dc398980c3a5d0e564943efbf44a478dc6b0c93ae474ac6a5946470c42dfa400307ec0c41 SHA512 5f3167e90f92bf69f021d8c0cc08189182975769fcb31c76f0d4ab4353098b38abf0a04dcb33c7bff72922cb1d411f74e41e653410a769160ad946b71262be83
+EBUILD xkeyboard-config-2.40.ebuild 1110 BLAKE2B c41a77bd6e82a3c86beb54da8b64ff2ae253043b19a386beedc22fd264b95bec00d3dc4e89346fe1c105d9f6c2b6cceacac07d578923057e58f05545041b4e22 SHA512 cb7bf0f3cc410d567310d26af4bf1849699b0ce39ac8c2320746ca48ec46186bb5c5d7cc47ba9939ac04a72fd852c569c8ad5a3e967d905d516070aefc848845
+EBUILD xkeyboard-config-9999.ebuild 1110 BLAKE2B c41a77bd6e82a3c86beb54da8b64ff2ae253043b19a386beedc22fd264b95bec00d3dc4e89346fe1c105d9f6c2b6cceacac07d578923057e58f05545041b4e22 SHA512 cb7bf0f3cc410d567310d26af4bf1849699b0ce39ac8c2320746ca48ec46186bb5c5d7cc47ba9939ac04a72fd852c569c8ad5a3e967d905d516070aefc848845
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.40.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.40.ebuild
new file mode 100644
index 000000000000..4fcf0d647513
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.40.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson 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 git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-libs/libxslt
+	sys-devel/gettext
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 525a1106e280..4fcf0d647513 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -19,14 +19,19 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND=""
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
 	dev-libs/libxslt
 	sys-devel/gettext
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
 "
 
 pkg_setup() {
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 58f327355a94..2df4f902f2a2 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -24,5 +24,5 @@ DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05de
 EBUILD xscreensaver-6.05-r1.ebuild 6649 BLAKE2B 891003977a93c676505dcba1f38f4ee8225752cadcebd7c33c92a12a2df12c8950c86e16c2a756eb4dd9ec4b065ff061b65f993e0e71ddc06cd2b3974b45e118 SHA512 16f0aaf70d59747e0666fb3e0e3f5c4b69d672050ed2fcdcc57e90fea5530be416257245a7c1c352929522800204b436e81f97630b264afb993b571535de9c3e
 EBUILD xscreensaver-6.05-r2.ebuild 6744 BLAKE2B a7409658c267346f93d40ce61a1d186e0797f911ebf8c7700f95ef95e8b08f2e4238b9b2ff7f5d5cb6b2819b26c8d0d8c1061812d11554b14a5a33fbc8792e77 SHA512 20ccf63d1b987d9a969d121dded4bc55f6daa4a597ad3f0cb162ee4a94fa24239c17b9493d2112f42e805a89d5872d03df154865ee7d09a45f9e7dfef86dba4a
 EBUILD xscreensaver-6.06-r2.ebuild 7384 BLAKE2B 1a4ca56b92ba448cfd4084a67f0a92ada82408b82eb6de2659a50a0de7929210092f9df9b4561e6f159ba0199f86bea9b24a3248a1a7a20a4a64232f023fe831 SHA512 c57322877f5b47d1a84af869bdcf86f035e07436c81524b670762164210eb41170ae1d41f7198b648c50d3043f70e7c7cbfdf4b2edd607fc52dd048a11c087bc
-EBUILD xscreensaver-6.07-r2.ebuild 7836 BLAKE2B 3c0f6392a65984e80798e6b9f0041ef6025f36cc758dcc661c1990294e2546ef9f38f9defb7848a7d094a4f4b1d647e90c370d761fb8401bd6d376197a8bbbb7 SHA512 75c827b2f1d9c0a51f92ffff2089d3652e3daccc6130bd3b304d55ab60da7ab981cf2f10baa5e2e54b63a7a11f37a5cc9890c08e7e292b56e975d8c4215534e7
+EBUILD xscreensaver-6.07-r2.ebuild 7834 BLAKE2B a14a2b13411bb70f6b5c650116934375f44f9299c7112fd8433831cbe3ebb86d1cd9e2b0993d18ae08569e874eccf89bb3e4da85071f5c0639adbf11af3c1007 SHA512 81b4c3cbf4771a3b1dd242b18b0f458e1953688798a88ab779241df99b763ae287026778a0d115edd1c857d4fffffcfd934edd4e2db9722beee84702f42d03de
 MISC metadata.xml 1451 BLAKE2B 052182f01632e8179ad1d6fe358a823384284776cc90eaa6413b809744783b31f7d8fc8ddefa03e66a691ad11aab967db3fb400290f813cb7eff2dab149f45cb SHA512 d4abaebc08315a90d2c68baf08b307989d4fc8efc4606b151ae3d94311c64ebe13253f572845cc5a8e1e30d1bbccf3d0b16c74376d5ff61de1f1ecb1030099a8
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
index 29fc6c4aacc4..be31229348f9 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )