gentoo auto-resync : 03:09:2024 - 12:28:20

3 files changed, 2 insertions, 71 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 267fd6426e2f..30bcc69be448 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
 DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9
-EBUILD xkeyboard-config-2.41.ebuild 1636 BLAKE2B 4967819e4ce4d77947bda3195747beb826a21cd78ecc5bb05bfcf0669d0f020ff6a879a3881d03d8dee3758b8e8b68e7b5a4c319d931d34a5fe1c849abe79e21 SHA512 968ee58b66c757c7ae0e982f0969c61f54f34a18d66e7573a9a37f89d949b2d146a7780b1a8eda724ce7278276cffc83be1b67bb7691da699d3bf749cd97a923
-EBUILD xkeyboard-config-2.42.ebuild 1581 BLAKE2B 9dd5e0e6f2df41f5e865ce0c41ec9720593321be20c08084b763b4f4c549f8eeb6c298c32f7d7e0daa18fed9267f09a1cbfea7690f7ffa8f230191efae9ddc21 SHA512 6b7d5d65502b999a2a91436e3c8f0a3cf468fe3b52be019c37e7f891befe874f9272c12460b23523a98f611e42974cb6536912c7ab9a9f96faa8eda39d4b6e77
+EBUILD xkeyboard-config-2.42.ebuild 1580 BLAKE2B ba196671db42f7f9556c15eb8799ab3d90ed19f5b83cf685cb96de3de7ce93c5fe74b53f73fc8e1c6803a771a72cf6732a7fec15797a7f6799fab4224c9696fa SHA512 81dbc49f3a20c7bca6366f5bf8c263a717da5d66bae80f25d7e0cdda2cfdf54989a3f0041f067c56ce092cd3e4c71490542abfd4e15de289ad2bc31cf3668d9e
 EBUILD xkeyboard-config-9999.ebuild 1588 BLAKE2B de7766675047f78c5744d3d45b2a07c211833ef86bb915cb94d66eca41b783c14f984d5b0408f6329cdf1fd232a4584c46fd264537c3750e85690bf8e6959016 SHA512 ad4202019cf0628cea3dc16591f9e964c6195cfd4e1d904531182e186de1303d956ce5e6036ab6d55e09c4f117a2e79484043b639aad8ea74a6c9504ffff26a7
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild
deleted file mode 100644
index fe824fdb32a2..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 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 )"
-
-# <dev-python/pycountry-23.12.7 bug #920278
-BDEPEND="
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-	test? (
-		${PYTHON_DEPS}
-		x11-apps/xkbcomp
-		x11-libs/libxkbcommon
-		$(python_gen_any_dep '
-			dev-python/pycountry[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version \
-		"dev-python/pycountry[${PYTHON_USEDEP}]" \
-		"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
-		"dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-
-	# Remove pytest timeout
-	sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die
-}
-
-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-2.42.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
index 3d57d234a633..15135c82ec6d 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"