From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CD821581F3 for ; Mon, 25 Nov 2024 19:02:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C8B8E0819; Mon, 25 Nov 2024 19:02:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 034A7E0824 for ; Mon, 25 Nov 2024 19:02:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 462CF343030 for ; Mon, 25 Nov 2024 19:02:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEE7E1E75 for ; Mon, 25 Nov 2024 19:02:23 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1732561338.433cfe5e6f19889b6a7a2b22d1faa270e83f280b.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xkeyboard-config/Manifest x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild X-VCS-Directories: x11-misc/xkeyboard-config/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 433cfe5e6f19889b6a7a2b22d1faa270e83f280b X-VCS-Branch: master Date: Mon, 25 Nov 2024 19:02:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 531280b8-dfee-4bec-ba74-f684a24290af X-Archives-Hash: a23a45aeb637a83a13706b6729ebb9d2 commit: 433cfe5e6f19889b6a7a2b22d1faa270e83f280b Author: Matt Turner gentoo org> AuthorDate: Mon Nov 25 19:01:24 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Nov 25 19:02:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433cfe5e x11-misc/xkeyboard-config: Drop old versions Signed-off-by: Matt Turner gentoo.org> x11-misc/xkeyboard-config/Manifest | 1 - .../xkeyboard-config/xkeyboard-config-2.42.ebuild | 66 ---------------------- 2 files changed, 67 deletions(-) diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index d80903f1c0d1..bb20b6e18e13 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,2 +1 @@ -DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9 DIST xkeyboard-config-2.43.tar.xz 925424 BLAKE2B 89cf4872305ce3358185ed63f0ff2f0dc90205d50d51b4b881256e0762b12a74f30d0905a75e5feff2f0fef09d94bee778a8cbe83cdf6e048653e8eb42f53087 SHA512 6daf885bf8794cf03d5b447b90ca1666f87e9c609a344e02bb90edca360eb64b24f80a92ed570aa75b4ea62245b3998f6df3757f7e02c4015cdfecee5378a0d4 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild deleted file mode 100644 index e62a6b47fe03..000000000000 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..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 ~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=" - dev-lang/perl - dev-libs/libxslt - sys-devel/gettext - ${PYTHON_DEPS} - test? ( - 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() { - 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 -}